--- a/packages.xml	Wed Jun 29 03:37:33 2011 +0100
+++ b/packages.xml	Thu Jun 30 19:07:43 2011 +0100
@@ -21,33 +21,13 @@
 	 symlinks from /usr/gnu/bin/gcc to /usr/gcc/4.5/bin/gcc,
 	 and analogously for libraries. -->
     <name>SFEgccruntime</name>
-    <ips_package_name>system/library/gcc-45-runtime</ips_package_name>
+    <ips_package_name>runtime/gcc</ips_package_name>
     <group>System/Libraries</group>
-    <pkg>
-      <name>SFEgcc</name>
-      <ips_package_name>developer/gcc-45</ips_package_name>
-      <group>Development/C</group>
-    </pkg>
-    <pkg>
-      <name>SFEgcc-l10n</name>
-      <ips_package_name>system/library/gcc-45/locale</ips_package_name>
-      <group>System/Libraries</group>
-    </pkg>
   </pkg>
   <pkg filename="SFEgcc-46.spec">
     <name>SFEgcc-46-runtime</name>
-    <ips_package_name>system/library/gcc-46-runtime</ips_package_name>
+    <ips_package_name>runtime/gcc-46</ips_package_name>
     <group>System/Libraries</group>
-    <pkg>
-      <name>SFEgcc-46</name>
-      <ips_package_name>developer/gcc-46</ips_package_name>
-      <group>Development/C</group>
-    </pkg>
-    <pkg>
-      <name>SFEgcc-46-l10n</name>
-      <ips_package_name>system/library/gcc-46/locale</ips_package_name>
-      <group>System/Libraries</group>
-    </pkg>
   </pkg>
   <pkg>
     <name>SFEyasm</name>
@@ -91,6 +71,10 @@
     <group>Development/Perl</group>
   </pkg>
   <pkg>
+    <name>SFEpython3</name>
+    <ips_package_name>runtime/python-32</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEvala</name>
     <ips_package_name>developer/vala</ips_package_name>
     <group>Development/Other Languages</group>
@@ -131,7 +115,7 @@
     <ips_package_name>library/libiconv</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
-  <pkg>
+  <pkg> <!-- hunspell displays Cyrillic characters incorrectly with ncurses -->
     <name>SFEncursesw</name>
     <ips_package_name>library/ncursesw</ips_package_name>
     <group>System/Libraries</group>
@@ -154,7 +138,7 @@
   </pkg>
   <pkg>
     <name>SFEfreeglut</name>
-    <ips_package_name>image/library/freeglut</ips_package_name>
+    <ips_package_name>x11/library/freeglut</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg>