diff --git a/packages/x11/lib/libICE/package.mk b/packages/x11/lib/libICE/package.mk
index 8dd71d92be..c661573dff 100644
--- a/packages/x11/lib/libICE/package.mk
+++ b/packages/x11/lib/libICE/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="https://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros xtrans"
 PKG_LONGDESC="X Inter-Client Exchange (ICE) protocol library."
+PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
diff --git a/packages/x11/lib/libSM/package.mk b/packages/x11/lib/libSM/package.mk
index a2b16ef523..0f21a14c18 100644
--- a/packages/x11/lib/libSM/package.mk
+++ b/packages/x11/lib/libSM/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain util-macros util-linux libICE"
 PKG_LONGDESC="This package provides the main interface to the X11 Session Management library."
+PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
diff --git a/packages/x11/lib/libXcomposite/package.mk b/packages/x11/lib/libXcomposite/package.mk
index d44f2a0d46..d4d3b3cc1f 100644
--- a/packages/x11/lib/libXcomposite/package.mk
+++ b/packages/x11/lib/libXcomposite/package.mk
@@ -12,8 +12,6 @@ PKG_DEPENDS_TARGET="toolchain util-macros libXfixes libXext libX11"
 PKG_LONGDESC="X Composite Library"
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-
 post_configure_target() {
   libtool_remove_rpath libtool
 }
diff --git a/packages/x11/lib/libXdamage/package.mk b/packages/x11/lib/libXdamage/package.mk
index 9bc7b8b877..0034358719 100644
--- a/packages/x11/lib/libXdamage/package.mk
+++ b/packages/x11/lib/libXdamage/package.mk
@@ -12,8 +12,6 @@ PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes"
 PKG_LONGDESC="LibXdamage provides an X Window System client interface to the DAMAGE extension to the X protocol."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-
 post_configure_target() {
   libtool_remove_rpath libtool
 }
diff --git a/packages/x11/lib/libXfixes/package.mk b/packages/x11/lib/libXfixes/package.mk
index 865d883298..8d247563dc 100644
--- a/packages/x11/lib/libXfixes/package.mk
+++ b/packages/x11/lib/libXfixes/package.mk
@@ -12,8 +12,6 @@ PKG_DEPENDS_TARGET="toolchain util-macros libX11"
 PKG_LONGDESC="X Fixes Library"
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-
 post_configure_target() {
   libtool_remove_rpath libtool
 }
diff --git a/packages/x11/lib/libXi/package.mk b/packages/x11/lib/libXi/package.mk
index 4db930fe4c..61d7210931 100644
--- a/packages/x11/lib/libXi/package.mk
+++ b/packages/x11/lib/libXi/package.mk
@@ -12,8 +12,7 @@ PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes libXext"
 PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
-                           --enable-malloc0returnsnull \
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull \
                            --disable-silent-rules \
                            --disable-docs \
                            --disable-specs \
diff --git a/packages/x11/lib/libXrender/package.mk b/packages/x11/lib/libXrender/package.mk
index 0b11d355f9..af28bbc5c7 100644
--- a/packages/x11/lib/libXrender/package.mk
+++ b/packages/x11/lib/libXrender/package.mk
@@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain util-macros libX11"
 PKG_LONGDESC="The X Rendering Extension introduces digital image composition within the X Window System."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"
 
 post_configure_target() {
   libtool_remove_rpath libtool
diff --git a/packages/x11/lib/libXtst/package.mk b/packages/x11/lib/libXtst/package.mk
index 84f38eed31..9fa43bc056 100644
--- a/packages/x11/lib/libXtst/package.mk
+++ b/packages/x11/lib/libXtst/package.mk
@@ -11,7 +11,7 @@ PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VE
 PKG_DEPENDS_TARGET="toolchain util-macros libXext libXi libX11"
 PKG_LONGDESC="The Xtst Library"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-gnu-ld --without-xmlto"
+PKG_CONFIGURE_OPTS_TARGET="--with-gnu-ld --without-xmlto"
 
 post_configure_target() {
   libtool_remove_rpath libtool
diff --git a/packages/x11/lib/libxshmfence/package.mk b/packages/x11/lib/libxshmfence/package.mk
index 01d4e94f0a..df198eeca1 100644
--- a/packages/x11/lib/libxshmfence/package.mk
+++ b/packages/x11/lib/libxshmfence/package.mk
@@ -12,5 +12,3 @@ PKG_DEPENDS_TARGET="toolchain util-macros xorgproto"
 PKG_LONGDESC="libxshmfence is the Shared memory 'SyncFence' synchronization primitive."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"