diff --git a/packages.ia b/packages.ia
index acec0cf..ab9c50a 100644
--- a/packages.ia
+++ b/packages.ia
@@ -226,7 +226,7 @@ libc6-prof
 libqt4-dev
 comerr-dev
 e2fslibs-dev
-libcap2-dev
+libcap-dev
 libattr1-dev
 libacl1-dev
 libselinux1-dev
@@ -261,7 +261,7 @@ libghc6-quickcheck-doc
 libxinerama-dev
 libboost-dev
 libgtk2.0-dev
-libz-dev
+zlib1g-dev
 libcurl4-gnutls-dev
 libexpat1-dev
 libglib2.0-dev
@@ -299,7 +299,6 @@ camlp4
 # perl
 perl
 libsvn-perl
-libsvn-core-perl
 libdbd-sqlite3-perl
 
 # python
@@ -419,7 +418,6 @@ ldap-utils
 smartmontools
 syslinux
 bsdmainutils
-grep-dctrl
 dctrl-tools
 ddrescue
 gddrescue
@@ -496,7 +494,6 @@ nn
 ed
 slrn
 vim
-vim-full
 vim-gnome
 nano
 nvi
@@ -566,7 +563,7 @@ dvd+rw-tools
 dvgrab
 dvdrip
 lame
-toolame
+twolame
 cheese
 cdrdao
 cdparanoia
@@ -579,7 +576,6 @@ nmap
 john
 rtorrent
 amarok
-nessus
 
 # fonts
 console-terminus
@@ -587,7 +583,6 @@ xfonts-terminus
 xfonts-base
 gsfonts
 gsfonts-x11
-ttf-bitstream-vera
 ttf-dejavu
 ttf-opensymbol
 ttf-freefont
@@ -597,70 +592,70 @@ remove pulseaudio;
 
 if nogames { remove nethack-common; };
 if bnbt { install bnbt; };
-if conserver { install conserver-server; };
-if dnsmasq { install dnsmasq; };
-
-if ldap {
- install nscd libnss-ldapd ldap-utils libpam-krb5;
-};
-
-if gnome {
-  install gdm gdm-themes gnome-core gnome-office;
-};
-
-if kde {
-  install kde-core;
-};
-
-if hddtemp {
-  install hddtemp;
-};
-
-if kadmin {
-  install krb5-admin-server;
-};
-
-if kdc {
- install krb5-kdc;
-};
-
-if mta {
- install postfix sasl2-bin spamassassin clamav postgrey;
-};
-
-if nagios-server {
- install nagios3;
-};
-
-if nagios-client {
- install nagios-nrpe-server nagios-plugins;
-};
-
-install nfs-common quota;
-
-if csclub {
- install libpam-csc;
-};
-
-if ldap-server {
- install slapd;
-};
-
-if snmpd {
-  install snmpd;
-};
-
-install ssh pssh clusterssh dsh;
-install sudo-ldap;
-
-if xapps {
- install yakuake gimp openoffice.org xterm pidgin pidgin-otr gksu xpdf xsel rxvt-unicode gmrun dzen2;
-};
-
-if xfce {
- install xfce4;
-};
-
-if xorg {
- install xserver-xorg xfonts-base;
-};
+#if conserver { install conserver-server; };
+#if dnsmasq { install dnsmasq; };
+#
+#if ldap {
+# install nscd libnss-ldapd ldap-utils libpam-krb5;
+#};
+#
+#if gnome {
+#  install gdm gdm-themes gnome-core gnome-office;
+#};
+#
+#if kde {
+#  install kde-core;
+#};
+#
+#if hddtemp {
+#  install hddtemp;
+#};
+#
+#if kadmin {
+#  install krb5-admin-server;
+#};
+#
+#if kdc {
+# install krb5-kdc;
+#};
+#
+#if mta {
+# install postfix sasl2-bin spamassassin clamav postgrey;
+#};
+#
+#if nagios-server {
+# install nagios3;
+#};
+#
+#if nagios-client {
+# install nagios-nrpe-server nagios-plugins;
+#};
+#
+#install nfs-common quota;
+#
+#if csclub {
+# install libpam-csc;
+#};
+#
+#if ldap-server {
+# install slapd;
+#};
+#
+#if snmpd {
+#  install snmpd;
+#};
+#
+#install ssh pssh clusterssh dsh;
+#install sudo-ldap;
+#
+#if xapps {
+# install yakuake gimp openoffice.org xterm pidgin pidgin-otr gksu xpdf xsel rxvt-unicode gmrun dzen2;
+#};
+#
+#if xfce {
+# install xfce4;
+#};
+#
+#if xorg {
+# install xserver-xorg xfonts-base;
+#};