diff --git a/package/avm/wmx/wmx.desc b/package/avm/wmx/wmx.desc
index 6ae0ac27f..f1eb47d4d 100644
--- a/package/avm/wmx/wmx.desc
+++ b/package/avm/wmx/wmx.desc
@@ -28,10 +28,9 @@
 [T] vehicle for features that fall comfortably outside the scope of the 
 [T] manifesto for the original wm2.
 
-
 [U] http://www.all-day-breakfast.com/wmx/ wmx original authors homepage
 [U] http://sec.42.org/wmx/ wmx developement homepage
-[D] 409205478 wmx-6.tar.gz http://www.all-day-breakfast.com/wmx/
+
 [A] Chris Cannam <cannam@all-day-breakfast.com> {original author}
 [A] Stefan 'sec' Zehl <sec@42.org> {maintainer}
 [M] Andreas V. 'netrunner' Meier <avmeier@web.de>
@@ -40,7 +39,8 @@
 
 [L] GPL
 [S] Stable
-[V] 6 20010423
+[V] 6
 [P] X -?---5---9 205.300
 
+[D] 409205478 wmx-6.tar.gz http://www.all-day-breakfast.com/wmx/
 
diff --git a/package/import/freedict/hosted_freedict.desc b/package/import/freedict/hosted_freedict.desc
index e1d7d937f..148b6f03f 100644
--- a/package/import/freedict/hosted_freedict.desc
+++ b/package/import/freedict/hosted_freedict.desc
@@ -32,7 +32,7 @@
 #endif
 
 #if xpkg == freedict-cro-eng
-[V] 0.0.3 
+[V] 0.0.3
 [D] 991405987 cro-eng.tar.gz http://dl.sourceforge.net/sourceforge/freedict/
 #endif
 
@@ -187,7 +187,7 @@
 #endif
 
 #if xpkg == freedict-kha-deu
-[V] 2nd. Online Draft
+[V] 2nd_draft
 [D] 198522417 kha-deu.tar.gz http://dl.sourceforge.net/sourceforge/freedict/
 #endif
 
diff --git a/package/import/freedict/hosted_freedict.sel b/package/import/freedict/hosted_freedict.sel
index 4718ef311..4a074a8d6 100644
--- a/package/import/freedict/hosted_freedict.sel
+++ b/package/import/freedict/hosted_freedict.sel
@@ -13,7 +13,7 @@ case "$xpkg" in
 		;;
 	freedict-cro-eng)
 		freedict="cro-eng"
-		freedictver="0.0.3 "
+		freedictver="0.0.3"
 		srctar="cro-eng.tar.bz2"
 		;;
 	freedict-cze-eng)
@@ -168,7 +168,7 @@ case "$xpkg" in
 		;;
 	freedict-kha-deu)
 		freedict="kha-deu"
-		freedictver="2nd. Online Draft"
+		freedictver="2nd_draft"
 		srctar="kha-deu.tar.bz2"
 		;;
 	freedict-lat-deu)
diff --git a/package/import/freedict/hosted_freedict.txt b/package/import/freedict/hosted_freedict.txt
index d70e513eb..9b7de6979 100644
--- a/package/import/freedict/hosted_freedict.txt
+++ b/package/import/freedict/hosted_freedict.txt
@@ -1,6 +1,6 @@
 afr-deu 0.0.1
 afr-eng 0.0.1
-cro-eng 0.0.3 
+cro-eng 0.0.3
 cze-eng 0.0.1
 dan-eng 0.0.1
 deu-eng 0.0.1
@@ -31,7 +31,7 @@ hun-eng 0.0.1
 iri-eng 0.0.1
 ita-deu 0.0.1
 jpn-deu 0.0.1
-kha-deu 2nd. Online Draft
+kha-deu 2nd_draft
 lat-deu 0.0.1
 lat-eng 0.0.1
 nld-deu 0.0.1
diff --git a/package/kasc/lgeneral/lgeneral.desc b/package/kasc/lgeneral/lgeneral.desc
index 90bb94dd5..15e22860e 100644
--- a/package/kasc/lgeneral/lgeneral.desc
+++ b/package/kasc/lgeneral/lgeneral.desc
@@ -41,7 +41,7 @@
 
 [L] GPL
 [S] Stable
-[V] 1.1.1 1.1.3 0.32
+[V] 1.1.3
 [P] X -?---5---9 214.800
 
 [D] 178616783 lgeneral-1.1.1.tar.gz http://ftp1.sourceforge.net/lgeneral/
diff --git a/package/misc/xsteak/xsteak.desc b/package/misc/xsteak/xsteak.desc
index 20ad6ddd2..7a50a0243 100644
--- a/package/misc/xsteak/xsteak.desc
+++ b/package/misc/xsteak/xsteak.desc
@@ -36,7 +36,7 @@
 
 [L] GPL
 [S] Beta
-[V] 1.7.3 
+[V] 1.7.3
 [P] X -?---5---9 134.800
 
 [D] 2087611426 Steak.1.7.3.tar.bz2 http://www.tm.informatik.uni-frankfurt.de/~razi/steak/program/
diff --git a/package/praenti/libmikmod/libmikmod.desc b/package/praenti/libmikmod/libmikmod.desc
index dfb2f6095..82388f43b 100644
--- a/package/praenti/libmikmod/libmikmod.desc
+++ b/package/praenti/libmikmod/libmikmod.desc
@@ -39,7 +39,7 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.10 
+[V] 3.1.10
 [P] X -?---5---9 124.300
 
 [D] 1850153016 libmikmod-3.1.10.tar.gz http://www.ibiblio.org/pub/linux/apps/sound/libs/
diff --git a/package/rene/bladeenc/bladeenc.desc b/package/rene/bladeenc/bladeenc.desc
index baeb4dec4..bf7e59944 100644
--- a/package/rene/bladeenc/bladeenc.desc
+++ b/package/rene/bladeenc/bladeenc.desc
@@ -39,7 +39,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.94.2 stable
+[V] 0.94.2
 [P] X -?---5---9 171.600
 
 [D] 3749716139 bladeenc-0.94.2-src-stable.tar.gz http://bladeenc.mp3.no/source/
diff --git a/package/rene/ploticus/ploticus.desc b/package/rene/ploticus/ploticus.desc
index 8ea17bdee..af3e8900a 100644
--- a/package/rene/ploticus/ploticus.desc
+++ b/package/rene/ploticus/ploticus.desc
@@ -41,7 +41,7 @@
 
 [L] GPL
 [S] Stable
-[V] 221 
+[V] 221
 [P] X -?---5---9 134.900
 
 [D] 4242654305 pl221src.tar.gz http://ploticus.sourceforge.net/download/
diff --git a/package/tschmidt/apollon/apollon.desc b/package/tschmidt/apollon/apollon.desc
index 84fdd84d1..9f0d6ce92 100644
--- a/package/tschmidt/apollon/apollon.desc
+++ b/package/tschmidt/apollon/apollon.desc
@@ -32,7 +32,7 @@
 
 [L] GPL
 [S] Stable
-[V] 1.0b1 
+[V] 1.0b1
 [P] X -?---5---9 203.200
 
 [DEP] libgift
diff --git a/package/tschmidt/splint/splint.desc b/package/tschmidt/splint/splint.desc
index f53f05f1a..c7bccf5ef 100644
--- a/package/tschmidt/splint/splint.desc
+++ b/package/tschmidt/splint/splint.desc
@@ -36,7 +36,7 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.1 
+[V] 3.1.1
 [P] X -?---5---9 800.000 
 
 [D] 1133352844 splint-3.1.1.src.tgz http://www.splint.org/downloads/
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 0940cf0ab..87150914c 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -537,7 +537,7 @@ parse_desc $confdir/$pkg.desc
 
 ver="`echo "$desc_V" | tail -n 1 | cut -f1 -d' '`"
 extraver="`echo "$desc_V" | tail -n 1 | cut -s -f2- -d' '`"
-[ -z "$extraver" ] && extraver="${rockver//DEV-*/DEV}"
+[ -z "$extraver" ] && extraver="0"
 
 if [ "$pkg" = "$xpkg" ]; then
 	echo_pkg_start $stagelevel $repository $xpkg $ver $extraver