diff --git a/create-modulemd.sh b/create-modulemd.sh
index 4a6a7e4..4d3cbfd 100755
--- a/create-modulemd.sh
+++ b/create-modulemd.sh
@@ -57,7 +57,8 @@ solvedbuilddeps=("hostname" "multilib-rpm-config" "help2man" "autoconf" "automak
             "imake" "cmake" "doxygen" "libusbx" "xorg-x11-proto-devel" "xorg-x11-util-macros" "xapian-core" "bison" \
             "python2" "tcl" "epydoc" "chrpath" "dbus-glib" "libcgroup" "checkpolicy" "policycoreutils" \
             "vala" "cups" "bluez" "git" "libical" "cups-filters" "docbook-dtds" "docbook-style-dsssl" "perl-SGMLSpm" \
-            "libyaml" )
+            "libyaml" "xorg-x11-xtrans-devel" "libICE" "libXau" "xorg-x11-xbitmaps" "fontconfig" \
+            "libglvnd" "jbigkit" "libjpeg-turbo" "libunwind" "libxcb" "pixman" "tcp_wrappers" "xorg-x11-proto-devel" )
 
 # "desktop-file-utils"  "python-cups" "gobject-introspection" "atk"
 debug() {
@@ -199,6 +200,31 @@ cat << EOT
         rpms:
 EOT
 cat $moduleapifile
+cat << EOT
+    filter:
+        rpms:
+            - clang-analyzer
+            - cups-client
+            - cups-ipptool
+            - cups-lpd
+            - boost-doctools
+            - boost-graph-mpich
+            - boost-graph-openmpi
+            - boost-mpich-devel
+            - boost-mpich
+            - boost-openmpi-devel
+            - boost-openmpi-python
+            - boost-mpich-python
+            - git-all
+            - git-cvs
+            - git-email
+            - git-gui
+            - gtk2-immodules
+            - libtool
+            - libtool-ltdl-devel
+            - perl-Git-SVN
+            - policycoreutils-gui
+EOT
 cat << EOT
     components:
         rpms:
diff --git a/shared-userspace.yaml b/shared-userspace.yaml
index 3c4ad1a..4854fa3 100644
--- a/shared-userspace.yaml
+++ b/shared-userspace.yaml
@@ -10,7 +10,7 @@ data:
             - MIT
     dependencies:
         buildrequires:
-            #  base-runtime: f26
+            # base-runtime: f26
             perl: f26
             # common-build-dependencies-bootstrap: f26
             common-build-dependencies: f26
@@ -100,7 +100,9 @@ data:
                 - mesa-libGLU
                 - pango
                 - parted
+                - perl-Error
                 - perl-SGMLSpm
+                - perl-TermReadKey
                 - pixman
                 - policycoreutils
                 - pulseaudio
@@ -113,6 +115,7 @@ data:
                 - tcl
                 - tcp_wrappers
                 - time
+                - valgrind
                 - xfsprogs
                 - xorg-x11-proto-devel
                 - xorg-x11-xbitmaps
@@ -199,7 +202,9 @@ data:
             - pango
             - parted
             - pixman
+            - perl-Error
             - perl-SGMLSpm
+            - perl-TermReadKey
             - policycoreutils
             - pulseaudio
             - python-pymongo
@@ -211,6 +216,7 @@ data:
             - tcl
             - tcp_wrappers
             - time
+            - valgrind
             - xfsprogs
             - xorg-x11-proto-devel
             - xorg-x11-xbitmaps
@@ -657,6 +663,26 @@ data:
                 rationale: libsecret dependency.
                 ref: f26
                 buildorder: 8
+            perl-Error:
+                rationale: Component for shared userspace - perl(Error).
+                ref: f26
+                buildorder: 15
+            perl-Test-Pod:
+                rationale: Requirement for perl(Error).
+                ref: f26
+                buildorder: 14
+            perl-Test-Pod-Coverage:
+                rationale: Requirement for perl(Error).
+                ref: f26
+                buildorder: 14
+            perl-TermReadKey:
+                rationale: Requirement for git.
+                ref: f26
+                buildorder: 14
+            valgrind:
+                rationale: Requirement for git.
+                ref: f26
+                buildorder: 12
 # TODO:
 # git <- libsecret <- deps:
 # gtk-doc