diff --git a/Programming/binutils/modulefile b/Programming/binutils/modulefile
index 91fc746..40d1d89 100644
--- a/Programming/binutils/modulefile
+++ b/Programming/binutils/modulefile
@@ -1,11 +1,11 @@
 #%Module1.0
 
-set whatis	"collection of binary tools like:ld, as, nm"
-set url		"http://www.gnu.org/software/binutils/"
-set license 	"GNU GPL v3"
-set maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-whatis		"collection of binary tools like:ld, as, nm"
+module-url		"http://www.gnu.org/software/binutils/"
+module-license	 	"GNU GPL v3"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 
-set help	"
+module-help	"
 The GNU Binutils are a collection of binary tools. The main ones are:
 
     ld - the GNU linker.
@@ -38,5 +38,3 @@ and disassemble machine instructions.
 The binutils have been ported to most major Unix variants as well as Wintel
 systems, and their main reason for existence is to give the GNU system (and
 GNU/Linux) the facility to compile and link programs."
-
-source		$env(PSI_LIBMODULES)