diff --git a/create-modulemd.sh b/create-modulemd.sh
index 63e5963..632cd69 100755
--- a/create-modulemd.sh
+++ b/create-modulemd.sh
@@ -55,7 +55,10 @@ solvedbuilddeps=("hostname" "multilib-rpm-config" "help2man" "autoconf" "automak
             "perl-libnet" "perl-local-lib" "perl-parent" "perl-perlfaq" "perl-podlators" \
             "perl-srpm-macros" "perl-threads" "perl-threads-shared" "perl-version" \
             "imake" "cmake" "doxygen" "libusbx" "xorg-x11-proto-devel" "xorg-x11-util-macros" "xapian-core" "bison" \
-            "python2" "tcl" "epydoc" "chrpath" "dbus-glib" "libcgroup" "checkpolicy" "policycoreutils" )
+            "python2" "tcl" "epydoc" "chrpath" "dbus-glib" "libcgroup" "checkpolicy" "policycoreutils" \
+            "vala" "cups" "bluez" "git" "libical" "cups-filter" "docbook-dtds" "docbook-style-dsssl" "perl-SGMLSpm" \
+            "libyaml" )
+
 # "desktop-file-utils"  "python-cups" "gobject-introspection" "atk"
 debug() {
    echo "$@" 1>&2
diff --git a/shared-userspace.yaml b/shared-userspace.yaml
index c0d41a4..52ccaec 100644
--- a/shared-userspace.yaml
+++ b/shared-userspace.yaml
@@ -27,6 +27,7 @@ data:
                 - SDL
                 - alsa-lib
                 - atk
+                - bluez
                 - boost
                 - btrfs-progs
                 - cairo
@@ -36,8 +37,11 @@ data:
                 - compat-openssl10
                 - compiler-rt
                 - cups
+                - cups-filter
                 - dbus-glib
                 - desktop-file-utils
+                - docbook-dtds
+                - docbook-style-dsssl
                 - epydoc
                 - gdk-pixbuf2
                 - git
@@ -70,6 +74,7 @@ data:
                 - libcgroup
                 - libdrm
                 - libedit
+                - libical
                 - libselinux
                 - libssh
                 - libstemmer
@@ -85,6 +90,7 @@ data:
                 - mesa-libGLU
                 - pango
                 - parted
+                - perl-SGMLSpm
                 - policycoreutils
                 - pulseaudio
                 - python-pymongo
@@ -108,6 +114,7 @@ data:
             - SDL
             - alsa-lib
             - atk
+            - bluez
             - boost
             - btrfs-progs
             - cairo
@@ -117,8 +124,11 @@ data:
             - compat-openssl10
             - compiler-rt
             - cups
+            - cups-filter
             - dbus-glib
             - desktop-file-utils
+            - docbook-dtds
+            - docbook-style-dsssl
             - epydoc
             - gdk-pixbuf2
             - git
@@ -151,6 +161,7 @@ data:
             - libcgroup
             - libdrm
             - libedit
+            - libical
             - libselinux
             - libssh
             - libstemmer
@@ -166,6 +177,7 @@ data:
             - mesa-libGLU
             - pango
             - parted
+            - perl-SGMLSpm
             - policycoreutils
             - pulseaudio
             - python-pymongo
@@ -243,10 +255,38 @@ data:
                 rationale: Component for shared userspace - gtk2.
                 ref: f26
                 buildorder: 10
+            cups-filter:
+                rationale: Runtime requirement for cups.
+                ref: f26
+                buildorder: 11
             cups:
                 rationale: Requirement for gtk2.
                 ref: f26
                 buildorder: 5
+            libical:
+                rationale: Requirement for gtk2.
+                ref: f26
+                buildorder: 5
+            bluez:
+                rationale: Requirement for gtk2.
+                ref: f26
+                buildorder: 11
+            perl-SGMLSpm:
+                rationale: Requirement for docbook-utils.
+                ref: f26
+                buildorder: 6
+            docbook-dtds:
+                rationale: runtime requirement for boost-doctools.
+                ref: f26
+                buildorder: 6
+            docbook-style-dsssl:
+                rationale: Requirement for docbook-utils.
+                ref: f26
+                buildorder: 6
+            docbook-style-xsl:
+                rationale: runtime requirement for boost-doctools.
+                ref: f26
+                buildorder: 6
             atk:
                 rationale: Requirement for gtk2.
                 ref: f26
@@ -295,6 +335,10 @@ data:
                 rationale: Requirement for gtk2.
                 ref: f26
                 buildorder: 5
+            libyaml:
+                rationale: Runtime requirement for PyYAML.
+                ref: f26
+                buildorder: 12
             hesiod:
                 rationale: Component for shared userspace - hesiod.
                 ref: f26