diff --git a/gtk2/gtk2.spec b/gtk2/gtk2.spec
index 828481205f..40c06ba0bb 100644
--- a/gtk2/gtk2.spec
+++ b/gtk2/gtk2.spec
@@ -23,10 +23,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   FIXME: rse: | on "make install": cannot load module
-#   FIXME: rse: | /tmp/rse/openpkg/gtk+-2.2.1/modules/input/im-am-et.la:
-#   FIXME: rse: | /tmp/rse/openpkg/gtk+-2.2.1/modules/input/.libs/: inva
-
 #   package version
 %define       V_gtk         2.2.1
 %define       V_gtk_major   2.2
@@ -44,7 +40,7 @@ Distribution: OpenPKG [JUNK]
 Group:        XWindow
 License:      GPL
 Version:      %{V_gtk}
-Release:      20030328
+Release:      20030519
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ -52,8 +48,12 @@ Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021218, glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >= %{V_atk_major}, X11, png, jpeg, tiff, gettext
-PreReq:       OpenPKG, openpkg >= 20021218, glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >= %{V_atk_major}, X11, png, jpeg, tiff, gettext
+BuildPreReq:  OpenPKG, openpkg >= 20021218, glib2 >= %{V_glib_major}
+BuildPreReq:  X11, png, jpeg, tiff, gettext
+BuildPreReq:  pango >= %{V_pango_major}, atk >= %{V_atk_major}
+PreReq:       OpenPKG, openpkg >= 20021218, glib2 >= %{V_glib_major}
+PreReq:       X11, png, jpeg, tiff, gettext
+PreReq:       pango >= %{V_pango_major}, atk >= %{V_atk_major}
 AutoReq:      no
 AutoReqProv:  no
 
@@ -66,24 +66,80 @@ AutoReqProv:  no
 %prep
     %setup -q -n gtk+-%{version}
 
+    #   avoid including static libraries into convenience libraries
+    %{l_shtool} subst \
+        -e 's;^LIBS =.*;LIBS =;' \
+        gdk-pixbuf/Makefile.in \
+        gdk-pixbuf/pixops/Makefile.in \
+        gdk/x11/Makefile.in
+
+    #   avoid searching for shared libraries
+    %{l_shtool} subst \
+        -e 's;\$export_dynamic_flag_spec;;g' \
+        -e 's;\$lt_export_dynamic_flag_spec;;g' \
+        configure
+
+    #   build binaries from static libraries
+    %{l_shtool} subst \
+        -e 's;\(gtk_demo_LDFLAGS *=\);\1 -static;' \
+        -e 's;\(gtk_demo_LDADD .*\);\1 -lintl;' \
+        -e 's;\(gtk_query_immodules_2_0_LDFLAGS *=\);\1 -static;' \
+        -e 's;\(gtk_query_immodules_2_0_LDADD .*\);\1 -lintl;' \
+        -e 's;\(gdk_pixbuf_csource_LDFLAGS *=\);\1 -static;' \
+        -e 's;\(gdk_pixbuf_csource_LDADD .*\);\1 -lintl;' \
+        -e 's;\(gdk_pixbuf_query_loaders_LDFLAGS *=\);\1 -static;' \
+        -e 's;\(gdk_pixbuf_query_loaders_LDADD .*\);\1 -lintl;' \
+        demos/gtk-demo/Makefile.in \
+        gtk/Makefile.in \
+        gdk-pixbuf/Makefile.in
+
+    #   remove version from paths
+    %{l_shtool} subst \
+        -e 's;/gtk-2\.0;/gtk2;g' \
+        -e 's;lib\(g[-_a-z]*\)-2\.0;lib\12;g' \
+        -e 's;/@PACKAGE@;;g' \
+        -e 's;-\$(GTK_API_VERSION);2;g' \
+        -e 's;/\$(GTK_BINARY_VERSION);;g' \
+        Makefile.in \
+        */Makefile.in \
+        */*/Makefile.in
+    %{l_shtool} subst \
+        -e 's;/gtk-2\.0;/gtk2;g' \
+        -e 's;-l\(g[-_a-z]*\)-@GTK_API_VERSION@;-l\12;g' \
+        -e 's;-l\(g[-_a-z]*\)-\${target}-@GTK_API_VERSION@;-l\12;g' \
+        *-2.0.pc.in
+
+    #   adjust path to locale and doc files
+    %{l_shtool} subst \
+        -e 's;\${libdir}/locale;\${datadir}/locale;' \
+        -e 's;/gtk-doc/html;/gtk2/html;g' \
+        configure
+    %{l_shtool} subst \
+        -e 's;\$(libdir)/locale;\$(datadir)/locale;' \
+        po/Makefile.in.in
+
 %build
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags tiff}" \
     LDFLAGS="%{l_ldflags}" \
-    LIBS="-lintl" \
     ./configure \
         --prefix=%{l_prefix} \
         --with-x \
         --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
         --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
         --with-glib-prefix=%{l_prefix} \
+        --with-libpng=%{l_prefix} \
+        --with-libjpeg=%{l_prefix} \
+        --with-libtiff=%{l_prefix} \
+        --disable-modules \
+        --with-included-loaders=yes \
         --enable-nls \
         --with-native-locale=no \
         --enable-shm \
         --disable-debug \
         --disable-rebuilds \
-        --disable-shared \
+        --enable-shared \
         --enable-static
     %{l_make} %{l_mflags}
 
@@ -92,6 +148,11 @@ AutoReqProv:  no
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/themes
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk*/demos
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so.*
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%not %dir %{l_prefix}/share/aclocal' \