diff --git a/nodes.ia b/nodes.ia
index e87ce2d..595b237 100644
--- a/nodes.ia
+++ b/nodes.ia
@@ -12,7 +12,7 @@ profiles csclub office machine amd64 natty;
 profiles csclub office machine i386 oneiric;
 
 @bit-shifter
-profiles csclub office machine amd64 natty;
+profiles csclub office machine amd64 oneiric;
 
 @nullsleep
 profiles csclub office machine amd64 natty;
diff --git a/packages.ia b/packages.ia
index 8f97d16..5f1c264 100644
--- a/packages.ia
+++ b/packages.ia
@@ -186,7 +186,7 @@ if @devel-full {
 
     # haskell
     install ghc6 ghc6-doc
-            @!lenny @!natty haskell-platform;
+            @!lenny @!natty @!oneiric haskell-platform;
 
     # ocaml
     install ocaml camlp4;
@@ -349,7 +349,7 @@ if @general-use {
     # math
     install graphviz r-recommended euler euler-doc gnuplot gnuplot-doc
             gap lp-solve mathomatic maxima maxima-doc
-            @X gnuplot-x11 @amd64 @!squeeze @!maverick @!wheezy @!natty xppaut
+            @X gnuplot-x11 @amd64 @!squeeze @!maverick @!wheezy @!natty @!oneiric xppaut
 	    @X rocs;
 
     # octave
@@ -469,7 +469,7 @@ if @X {
             @!lenny midori flashplugin-installer;
 
     # multimedia
-    install audacity @!natty @!oneiric kstreamripper audacious @!natty lmms k3b
+    install audacity @!natty @!oneiric kstreamripper audacious @!natty @!oneiric lmms k3b
             @!lenny ardour;
 
     # images
@@ -497,7 +497,7 @@ if @X {
     install geda @!natty @!oneiric ktechlab arduino ngspice bristol cl-rlc electric
             gerbv gnucap gpsim gsmc gspiceui gtkwave @!natty @!oneiric klogic linsmith
             oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc
-            eagle kic kicad;
+            @!oneiric eagle kic kicad;
 
     # virtualization
     install virtualbox-ose;