diff --git a/server/serverconfig/packagelist-nightly.txt b/server/serverconfig/packagelist-nightly.txt
index 2408c612c..1ce80a181 100644
--- a/server/serverconfig/packagelist-nightly.txt
+++ b/server/serverconfig/packagelist-nightly.txt
@@ -1,117 +1,104 @@
-# this is the package list for the automatic nightly builds
+# this is the package list for the automatic release builds
 # syntax:
 # category,package,target,patchlevel
 # e.g.:
 # win32libs-sources,dbus-src,1.4.0,1
 # is equivalent to emerge --target=1.4.0 --patchlevel=1 win32libs-sources/dbus-src
 #
-win32libs-sources,libssh-src,gitHEAD,
-kdesupport,poppler,gitHEAD,
-kdesupport,kdewin-installer,gitHEAD,
+#
+# kdesupport stuff
+libs,qt,,
 kdesupport,attica,,
-kdesupport,oxygen-icons,,
-kdesupport,strigi,gitHEAD,
-kdesupport,soprano,gitHEAD,
-kdesupport,phonon,gitHEAD,
-kdesupport,akonadi,gitHEAD,
-kdesupport,kdewin,gitHEAD,
-kdesupport,qca,gitHEAD,
+kdesupport,qjson,,
+kdesupport,dbusmenu-qt,,
+kdesupport,kdewin,,
+kdesupport,phonon,,
+kdesupport,phonon-vlc,,
+kdesupport,strigi,,
+kdesupport,soprano,,
+kdesupport,qca,,
 kdesupport,grantlee,,
-kdesupport,dbusmenu-qt,gitHEAD,
-kdesupport,phonon-vlc,gitHEAD,
-kdesupport,phonon-mplayer,gitHEAD,
-kdesupport,qjson,gitHEAD,
-kdesupport,libqtsoap,,
-kdesupport,hupnp,svnHEAD,
-kdesupport,snorenotify,gitHEAD,
-#
+kdesupport,qimageblitz,,
+kdesupport,qtscriptgenerator,,
+kdesupport,oxygen-icons,,
+kdesupport,akonadi,,
+kdesupport,snorenotify,,
 #
 # the KDE packages themselves
 kde,kdelibs,,
 kde,kdepimlibs,,
 kde,kde-runtime,,
 kde,kde-workspace,,
-kde,kdeplasma-addons,,
 kde,kde-baseapps,,
 #kdeedu
 kde,kdeedu,,
 kde,blinken,,
 kde,cantor,,
 kde,kalgebra,,
 kde,kalzium,,
 kde,kanagram,,
 kde,kbruch,,
 kde,kgeography,,
 kde,khangman,,
 kde,kig,,
 kde,kiten,,
 kde,klettres,,
 kde,kmplot,,
 kde,kstars,,
 kde,ktouch,,
 kde,kturtle,,
 kde,kwordquiz,,
 kde,libkdeedu,,
 kde,marble,,
 kde,parley,,
 kde,rocs,,
 kde,step,,
 #
 kde,kdegames,,
 #kdegraphics
 kde,kdegraphics,,
 kde,gwenview,,
 kde,kcolorchooser,,
 kde,kdegraphics-strigi-analyzer,,
 kde,kdegraphics-thumbnailers,,
 kde,kolourpaint,,
 kde,kruler,,
 kde,ksaneplugin,,
 kde,ksnapshot,,
 kde,libkdcraw,,
 kde,libkexiv2,,
 kde,libkipi,,
 kde,libksane,,
 kde,mobipocket,,
 kde,okular,,
 kde,svgpart,,
 #
 kde,kdemultimedia,,
 kde,kdenetwork,,
 kde,kdepim,,
 kde,kdepim-runtime,,
 kde,kdesdk,,
 kde,kdetoys,,
 kde,kdeutils,,
 #
 # the KDE extragear packages
 extragear,amarok,,
 extragear,kate,,
 extragear,kile,,
-extragear,digikam,gitHEAD,
-extragear,libalkimia,gitHEAD,
-extragear,kmymoney,gitHEAD,
-extragear,kmid,gitHEAD,
-extragear,konversation,gitHEAD,
-extragear,quassel,gitHEAD,
+# extragear,kipi-plugins,,
+extragear,digikam,,
+extragear,libalkimia,,
+extragear,kmymoney,,
+extragear,kmid,,
+extragear,konversation,,
+extragear,quassel,,
 extragear,kregexpeditor,,
-extragear,krecipes,gitHEAD,
-extragear,skanlite,,
-extragear,skrooge,gitHEAD,
-extragear,zanshin,gitHEAD,
-kdeapps,kbibtex,gitHEAD,
-testing,calligra,gitHEAD,
-extragear,kdevplatform,gitHEAD,
-extragear,kdevelop,gitHEAD,
-kdeapps,quanta,gitHEAD,
-testing,konstruktor,gitHEAD,
-extragear,kipi-plugins,,
 extragear,krecipes,,
-extragear,choqok,,
-extragear,libktorrent,,
-extragear,ktorrent,,
-extragear,krusader,,
-extragear,kphotoalbum,,
-testing,vlc,,
-testing,cagibi,0.1,
-testing,kio-upnp-ms,,
+extragear,skanlite,,
+extragear,skrooge,,
+extragear,zanshin,,
+kdeapps,kbibtex,,
+#
+# release pending:
+#extragear,kdevplatform,,
+#extragear,kdevelop,,