diff --git a/cryptcat/Pkgfile b/cryptcat/Pkgfile
index 4ca12fce6..c800898bc 100644
--- a/cryptcat/Pkgfile
+++ b/cryptcat/Pkgfile
@@ -1,8 +1,7 @@
-# Description:  Cryptcat is the standard netcat enhanced with twofish encryption.
-# URL:          http://farm9.org/Cryptcat/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:   
+# Description: Cryptcat is the standard netcat enhanced with twofish encryption.
+# URL: http://farm9.org/Cryptcat/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
 
 name=cryptcat
 version=1.2.1
diff --git a/di/Pkgfile b/di/Pkgfile
index 1ffdbeeb7..30060c4c9 100644
--- a/di/Pkgfile
+++ b/di/Pkgfile
@@ -1,8 +1,7 @@
-# Description:  disk information utility, displaying everything (and more) that your 'df' command does.
-# URL:          http://www.gentoo.com/di/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on: 
+# Description: disk information utility, displaying everything (and more) that your 'df' command does.
+# URL: http://www.gentoo.com/di/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
 
 name=di
 version=4.9
diff --git a/enemy-territory/Pkgfile b/enemy-territory/Pkgfile
index 97c6e3209..135f765f1 100644
--- a/enemy-territory/Pkgfile
+++ b/enemy-territory/Pkgfile
@@ -1,8 +1,8 @@
-# Description: 	Enemy Territory 2.60
-# URL: 		http://www.enemy-territory.com/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:	x11
+# Description: (FPS) computer game, and a standalone sequel to Return to Castle Wolfenstein.
+# URL: http://www.enemy-territory.com/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: x11
 
 name=enemy-territory
 version=2.60b
diff --git a/ifstat/Pkgfile b/ifstat/Pkgfile
index c498ae47b..1f0ef5745 100644
--- a/ifstat/Pkgfile
+++ b/ifstat/Pkgfile
@@ -1,9 +1,7 @@
-# Description: 	Tool to report network interfaces bandwith just like vmstat/iostat do for other system counters
-# URL:  	http://gael.roualland.free.fr/ifstat/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on: 
-
+# Description: Tool to report network interfaces bandwith just like vmstat/iostat do for other system counters
+# URL: http://gael.roualland.free.fr/ifstat/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
 
 name=ifstat
 version=1.1
diff --git a/libexo/Pkgfile b/libexo/Pkgfile
index 56c2c57b7..0bab474de 100644
--- a/libexo/Pkgfile
+++ b/libexo/Pkgfile
@@ -1,8 +1,8 @@
-# Description:  Extension library for Xfce4
-# URL:          http://thunar.xfce.org/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:	gtk,libxfce4util,python,p5-uri
+# Description: Extension library for Xfce4
+# URL: http://thunar.xfce.org/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: gtk,libxfce4util,python,p5-uri
 
 name=libexo
 version=0.3.1.12rc2
diff --git a/lmms/Pkgfile b/lmms/Pkgfile
index a99220725..85d373429 100644
--- a/lmms/Pkgfile
+++ b/lmms/Pkgfile
@@ -1,8 +1,8 @@
 # Description:  LMMS aims to be a free alternative to popular programs like FruityLoops.
-# URL:          http://lmms.sourceforge.net/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:   qt3,jack
+# URL: http://lmms.sourceforge.net/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: qt3,jack
 
 name=lmms
 version=0.2.1
@@ -13,7 +13,6 @@ build() {
         cd $name-$version
         ./configure --prefix=/usr \
 		    --mandir=/usr/man
-
         make
         make DESTDIR=$PKG install
         rm -rf $PKG/usr/info
diff --git a/mldonkey/Pkgfile b/mldonkey/Pkgfile
index 5766b9bd6..af7485848 100644
--- a/mldonkey/Pkgfile
+++ b/mldonkey/Pkgfile
@@ -1,8 +1,8 @@
-# Description:  Multi-platform multi-network peer-to-peer client.
-# URL:          http://mldonkey.sourceforge.net/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:	ocaml
+# Description: Multi-platform multi-network peer-to-peer client.
+# URL: http://mldonkey.sourceforge.net/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: ocaml
 
 name=mldonkey
 version=2.8.1
diff --git a/netbeans/Pkgfile b/netbeans/Pkgfile
index 7c1f974b4..af07ad2c8 100644
--- a/netbeans/Pkgfile
+++ b/netbeans/Pkgfile
@@ -1,8 +1,8 @@
-# Description: 	Cross-platform Java IDE.
-# URL: 		http://www.netbeans.org/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on: 	x11,jdk
+# Description: Cross-platform Java IDE.
+# URL: http://www.netbeans.org/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: x11,jdk
 
 name=netbeans
 version=5.5
diff --git a/rhapsody/Pkgfile b/rhapsody/Pkgfile
index 43f0ac67f..d6314dd75 100644
--- a/rhapsody/Pkgfile
+++ b/rhapsody/Pkgfile
@@ -1,8 +1,8 @@
-# Description:  Text console IRC client with intuitive menu driven user interface.
-# URL:          http://rhapsody.sourceforge.net/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:   ncurses
+# Description: Text console IRC client with intuitive menu driven user interface.
+# URL: http://rhapsody.sourceforge.net/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: ncurses
 
 name=rhapsody
 version=0.28b
diff --git a/sgmixer/Pkgfile b/sgmixer/Pkgfile
index bd6db5b86..ba598d76f 100644
--- a/sgmixer/Pkgfile
+++ b/sgmixer/Pkgfile
@@ -1,9 +1,8 @@
-# $Id: $
-# Description:  A simple GTK2 audio mixer
-# URL:          http://sgmixer.openfmi.net
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:   gtk
+# Description: A simple GTK2 audio mixer
+# URL: http://sgmixer.openfmi.net
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: gtk
 
 name=sgmixer
 version=0.3
diff --git a/thunar/Pkgfile b/thunar/Pkgfile
index d09b93903..4eb7ed9f4 100644
--- a/thunar/Pkgfile
+++ b/thunar/Pkgfile
@@ -1,9 +1,9 @@
-# Description:  Thunar is a new modern file manager for the Xfce Desktop Environment
-# URL:          http://thunar.xfce.org/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:	libexo,hal,shared-mime-info,desktop-file-utils
-# Optional:	intltool
+# Description: Thunar is a new modern file manager for the Xfce Desktop Environment
+# URL: http://thunar.xfce.org/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: libexo,hal,shared-mime-info,desktop-file-utils
+# Optional: intltool
 
 name=thunar
 version=0.5.0rc2
diff --git a/true-combat-elite/Pkgfile b/true-combat-elite/Pkgfile
index e20deb8a7..f566addae 100644
--- a/true-combat-elite/Pkgfile
+++ b/true-combat-elite/Pkgfile
@@ -1,8 +1,8 @@
-# Description: 	TrueCombat:Elite - A team-based realism modification, based on Enemy Territory.
-# URL: 		http://www.truecombatelite.net/
-# Maintainer:   Jose V Beneyto, <joberui@eui.upv.es>
-# Packager:     Jose V Beneyto, <joberui@eui.upv.es>
-# Depends on: 	enemy-territory
+# Description: TrueCombat:Elite is a team-based realism modification based on Enemy Territory.
+# URL: http://www.truecombatelite.net/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: enemy-territory
 
 name=true-combat-elite
 version=0.49b
diff --git a/xmbmon/Pkgfile b/xmbmon/Pkgfile
index 9250dcb98..620f7ff23 100644
--- a/xmbmon/Pkgfile
+++ b/xmbmon/Pkgfile
@@ -1,8 +1,8 @@
-# Description:  Monitoring program for motherboards. Also includes mbmon command line utility.
-# URL:          http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:   x11
+# Description: Monitoring program for motherboards. Also includes mbmon command line utility.
+# URL: http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
+# Depends on: x11
 
 name=xmbmon
 version=2.0.5
diff --git a/zsync/Pkgfile b/zsync/Pkgfile
index 7535f8ee5..af38eaa80 100644
--- a/zsync/Pkgfile
+++ b/zsync/Pkgfile
@@ -1,8 +1,7 @@
-# Description: 	Optimized client-side rsync algorithm like rsync -z, that no requires a remote server application
-# URL:          http://zsync.moria.org.uk/
-# Maintainer:   Jose V Beneyto, joberui at ei dot upv dot es
-# Packager:     Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on:   
+# Description: Optimized client-side rsync algorithm like rsync -z, that no requires a remote server application
+# URL: http://zsync.moria.org.uk/
+# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
+# Packager: Jose V Beneyto, joberui at ei dot upv dot es
 
 name=zsync
 version=0.5