diff --git a/create-modulemd.sh b/create-modulemd.sh
index 8f84aa6..2181a03 100755
--- a/create-modulemd.sh
+++ b/create-modulemd.sh
@@ -45,9 +45,9 @@ solvedbuilddeps=("hostname" "multilib-rpm-config" "help2man" "autoconf" "automak
             "perl-Test-Simple" "perl-Text-Balanced" "perl-Text-Diff" "perl-Text-Glob" "perl-Text-ParseWords" "perl-Text-Tabs+Wrap" \
             "perl-Text-Template" "perl-Thread-Queue" "perl-threads" "perl-threads-shared" "perl-Time-HiRes" "perl-Time-Local" \
             "perl-Unicode-Collate" "perl-Unicode-Normalize" "perl-URI" "perl-version" \
-            "cmake" "xapian-core" "libtool" "doxygen" "xorg-x11-util-macros" "libusbx" "expat" "python2" "tcl" "atk" "desktop-file-utils" \
-            "epydoc" "python-cups" "gobject-introspection" ) 
-
+            "cmake" "xapian-core" "libtool" "doxygen" "xorg-x11-util-macros" "libusbx" "expat" "python2" "tcl" \
+            "epydoc" "glib2" "xorg-x11-proto-devel" ) 
+# "desktop-file-utils"  "python-cups" "gobject-introspection" "atk"
 debug() {
    echo "$@" 1>&2
 #    return
@@ -201,14 +201,26 @@ cat << EOT
                 rationale: Build dep for many packages.
                 ref: f26
                 buildorder: 1
+#            glib2:
+#                rationale: Build dep for many packages.
+#                ref: f26
+#                buildorder: 2
             bison:
                 rationale: Build dep for many packages.
                 ref: f26
                 buildorder: 1
+            imake:
+                rationale: Build dep for many packages.
+                ref: f26
+                buildorder: 4
             doxygen:
                 rationale: Build dep for many packages.
                 ref: f26
                 buildorder: 2
+            xorg-x11-proto-devel:
+                rationale: Build dep for many packages.
+                ref: f26
+                buildorder: 3
             xorg-x11-util-macros:
                 rationale: Build dep for many packages.
                 ref: f26
@@ -224,31 +236,39 @@ cat << EOT
             atk:
                 rationale: dependency of gtk2.
                 ref: f26
-                buildorder: 5
+                buildorder: 9
             tcl:
                 rationale: dependency of python2.
                 ref: f26
                 buildorder: 5
-            desktop-file-utils:
-                rationale: dependency of cups/python-cups/epydoc.
-                ref: f26
-                buildorder: 5
+# desktop-file-utils need glib2 (and emacs)
+#            desktop-file-utils:
+#                rationale: dependency of cups/python-cups/epydoc.
+#                ref: f26
+#                buildorder: 5
             epydoc:
-                rationale: dependency of cups/python-cups.
-                ref: f26
-                buildorder: 6
-            python-cups:
+# disabled dep on desktop-file-utils
                 rationale: dependency of cups/python-cups.
                 ref: f26
                 buildorder: 7
+# python-cups requires cups
+#            python-cups:
+#                rationale: dependency of cups/python-cups.
+#                ref: f26
+#                buildorder: 7
             python2:
                 rationale: dependency of many packages.
                 ref: private-karsten-modularity
                 buildorder: 6
-            gobject-introspection:
-                rationale: dependency of many packages.
-                ref: f26
-                buildorder: 7
+#            libxslt:
+#                rationale: Component of shared-userspace module
+#                ref: f26
+#                buildorder: 7
+# go-i requires lots of stuff we don't have yet
+#            gobject-introspection:
+#                rationale: dependency of many packages.
+#                ref: f26
+#                buildorder: 8
 # TODO: remove avahi from cups
 ################################################################
 EOT
diff --git a/shared-userspace.yaml b/shared-userspace.yaml
index 9d4c95c..c05363a 100644
--- a/shared-userspace.yaml
+++ b/shared-userspace.yaml
@@ -22,18 +22,24 @@ data:
     profiles:
         default:
             rpms:
+                - alsa-lib
                 - hesiod
                 - libusb
                 - libxslt
-                - imake
+                - libicu
+                - libuv
+                - libedit
+                - libaio
     api:
         rpms:
+            - alsa-lib
             - hesiod
             - libusb
             - libxslt
-            - imake
             - libicu
             - libuv
+            - libedit
+            - libaio
     components:
         rpms:
             xapian-core:
@@ -48,14 +54,26 @@ data:
                 rationale: Build dep for many packages.
                 ref: f26
                 buildorder: 1
+#            glib2:
+#                rationale: Build dep for many packages.
+#                ref: f26
+#                buildorder: 2
             bison:
                 rationale: Build dep for many packages.
                 ref: f26
                 buildorder: 1
+            imake:
+                rationale: Build dep for many packages.
+                ref: f26
+                buildorder: 4
             doxygen:
                 rationale: Build dep for many packages.
                 ref: f26
                 buildorder: 2
+            xorg-x11-proto-devel:
+                rationale: Build dep for many packages.
+                ref: f26
+                buildorder: 3
             xorg-x11-util-macros:
                 rationale: Build dep for many packages.
                 ref: f26
@@ -71,33 +89,45 @@ data:
             atk:
                 rationale: dependency of gtk2.
                 ref: f26
-                buildorder: 5
+                buildorder: 9
             tcl:
                 rationale: dependency of python2.
                 ref: f26
                 buildorder: 5
-            desktop-file-utils:
-                rationale: dependency of cups/python-cups/epydoc.
-                ref: f26
-                buildorder: 5
+# desktop-file-utils need glib2 (and emacs)
+#            desktop-file-utils:
+#                rationale: dependency of cups/python-cups/epydoc.
+#                ref: f26
+#                buildorder: 5
             epydoc:
-                rationale: dependency of cups/python-cups.
-                ref: f26
-                buildorder: 6
-            python-cups:
+# disabled dep on desktop-file-utils
                 rationale: dependency of cups/python-cups.
                 ref: f26
                 buildorder: 7
+# python-cups requires cups
+#            python-cups:
+#                rationale: dependency of cups/python-cups.
+#                ref: f26
+#                buildorder: 7
             python2:
                 rationale: dependency of many packages.
                 ref: private-karsten-modularity
                 buildorder: 6
-            gobject-introspection:
-                rationale: dependency of many packages.
-                ref: f26
-                buildorder: 7
+#            libxslt:
+#                rationale: Component of shared-userspace module
+#                ref: f26
+#                buildorder: 7
+# go-i requires lots of stuff we don't have yet
+#            gobject-introspection:
+#                rationale: dependency of many packages.
+#                ref: f26
+#                buildorder: 8
 # TODO: remove avahi from cups
 ################################################################
+            alsa-lib:
+                rationale: Component for shared userspace - alsa-lib.
+                ref: f26
+                buildorder: 10
             hesiod:
                 rationale: Component for shared userspace - hesiod.
                 ref: f26
@@ -110,19 +140,19 @@ data:
                 rationale: Component for shared userspace - libxslt.
                 ref: f26
                 buildorder: 10
-            imake:
-                rationale: Component for shared userspace - imake.
+            icu:
+                rationale: Component for shared userspace - libicu.
                 ref: f26
                 buildorder: 10
-            xorg-x11-proto-devel:
-                rationale: Requirement for imake.
-                ref: f26
-                buildorder: 5
-            icu:
-                rationale: Dependency of many packages.
-                ref: f26
-                buildorder: 7
             libuv:
-                rationale: Requirement for nodejs.
+                rationale: Component for shared userspace - libuv.
                 ref: f26
-                buildorder: 2
+                buildorder: 10
+            libedit:
+                rationale: Component for shared userspace - libedit.
+                ref: f26
+                buildorder: 10
+            libaio:
+                rationale: Component for shared userspace - libaio.
+                ref: f26
+                buildorder: 10