diff --git a/packages.ia b/packages.ia
index 41477b9..5e50c4f 100644
--- a/packages.ia
+++ b/packages.ia
@@ -206,8 +206,7 @@ if @devel-full {
     @office install python-cups python-notify python-tk;
 
     # ruby
-    install ruby ruby-dev rubygems rake ruby1.9/ruby1.9.1
-            ruby1.9-dev/ruby1.9.1-dev;
+    # install ruby ruby-dev rubygems rake;
 
     # llvm
     install clang llvm-2.9/llvm llvm-2.9-dev/llvm-dev;
@@ -320,7 +319,7 @@ if @general-use {
 
     # databases
     install sqlite3 sqlite3-doc postgresql-client mysql-client
-            db4.7-util/db4.8-util;
+            @!jessie db4.7-util/db4.8-util @jessie db5.1-util/db5.3-util;
 
     # compression
     install unzip unrar sharutils cabextract p7zip p7zip-full p7zip-rar
@@ -351,22 +350,26 @@ if @general-use {
     install octave/octave3.2/octave3.0
             octave-doc/octave3.2-doc/octave3.0-doc;
 
-    @!quantal @!trusty
+    @!quantal @!trusty @!jessie
     install octave3.2-emacsen/octave3.0-emacsen
 	    octave3.2-headers/octave3.0-headers;
 
-    install octave-audio octave-benchmark octave-communications-common
+    install octave-audio octave-communications-common
 	    octave-communications octave-control octave-data-smoothing
-	    octave-econometrics octave-epstk octave-financial octave-fixed
+	    octave-econometrics octave-epstk octave-financial
 	    octave-fpl octave-ga octave-general octave-gsl octave-image
-	    octave-io octave-linear-algebra octave-mapping octave-miscellaneous
-	    octave-missing-functions octave-nan octave-nnet octave-nurbs
-	    octave-ocs octave-octcdf octave-octgpr octave-odepkg octave-optim
-	    octave-optiminterp octave-pkg-dev octave-plot
+	    octave-io octave-linear-algebra octave-miscellaneous
+	    octave-missing-functions octave-nan octave-nurbs
+	    octave-ocs octave-octcdf octave-odepkg octave-optim
+	    octave-optiminterp octave-pkg-dev
 	    octave-secs2d octave-signal octave-specfun
 	    octave-splines octave-statistics octave-strings octave-struct
 	    octave-symbolic octave-tsa octave-vrml octave-zenity
-	    octave-pfstools octave-plplot;
+	    octave-pfstools;
+
+    @!jessie
+    install octave-benchmark octave-fixed octave-mapping octave-mnet
+            octave-octgpr octave-plot octave-plplot;
 
     @!quantal @!jessie @!trusty
     install octave-ad octave-combinatorics octave-fixed octave-ftp octave-ident
@@ -397,7 +400,7 @@ if @general-use {
     install mutt alpine tin irssi
             @squeezebsd-mailx procmail centerim fetchmail
             slrn spamassassin
-            @!squeeze @!alpha pine;
+            @!squeeze @!alpha @!wheezy @!jessie pine;
 
     # utilities
     install rdiff tofrodos mc socat snmp snmp-mibs-downloader
@@ -538,7 +541,7 @@ if @core {
 	   sn;
 
     # X-only packages
-    @!x-core remove fam gamin hal pidgin dbus dbus-x11 xfonts-100dpi;
+    @!x-core remove fam gamin @!jessie hal pidgin dbus dbus-x11 xfonts-100dpi;
 
     # full X-only packages
     @!X remove consolekit @!alpha policykit-1 gvfs @!alpha udisks;