diff --git a/redhat/dependencies/qt3/0084-compositing-properties.patch b/redhat/qt3/0084-compositing-properties.patch
similarity index 100%
rename from redhat/dependencies/qt3/0084-compositing-properties.patch
rename to redhat/qt3/0084-compositing-properties.patch
diff --git a/redhat/dependencies/qt3/assistant3.desktop b/redhat/qt3/assistant3.desktop
similarity index 100%
rename from redhat/dependencies/qt3/assistant3.desktop
rename to redhat/qt3/assistant3.desktop
diff --git a/redhat/dependencies/qt3/designer3.desktop b/redhat/qt3/designer3.desktop
similarity index 100%
rename from redhat/dependencies/qt3/designer3.desktop
rename to redhat/qt3/designer3.desktop
diff --git a/redhat/dependencies/qt3/linguist3.desktop b/redhat/qt3/linguist3.desktop
similarity index 100%
rename from redhat/dependencies/qt3/linguist3.desktop
rename to redhat/qt3/linguist3.desktop
diff --git a/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch b/redhat/qt3/qt-3.0.5-nodebug.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.0.5-nodebug.patch
rename to redhat/qt3/qt-3.0.5-nodebug.patch
diff --git a/redhat/dependencies/qt3/qt-3.1.0-makefile.patch b/redhat/qt3/qt-3.1.0-makefile.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.1.0-makefile.patch
rename to redhat/qt3/qt-3.1.0-makefile.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch b/redhat/qt3/qt-3.3.4-print-CJK.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch
rename to redhat/qt3/qt-3.3.4-print-CJK.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/qt3/qt-3.3.6-fontrendering-214371.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch
rename to redhat/qt3/qt-3.3.6-fontrendering-214371.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
rename to redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
rename to redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
rename to redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
rename to redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
rename to redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch
rename to redhat/qt3/qt-3.3.8-fontrendering-#214570.patch
diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
rename to redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
diff --git a/redhat/dependencies/qt3/qt-uic-nostdlib.patch b/redhat/qt3/qt-uic-nostdlib.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-uic-nostdlib.patch
rename to redhat/qt3/qt-uic-nostdlib.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/qt3/qt-x11-free-3.3.2-quiet.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch
rename to redhat/qt3/qt-x11-free-3.3.2-quiet.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch
rename to redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
rename to redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
rename to redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/qt3/qt-x11-free-3.3.6-strip.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch
rename to redhat/qt3/qt-x11-free-3.3.6-strip.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/qt3/qt-x11-free-3.3.7-arm.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch
rename to redhat/qt3/qt-x11-free-3.3.7-arm.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/qt3/qt-x11-free-3.3.7-umask.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch
rename to redhat/qt3/qt-x11-free-3.3.7-umask.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/qt3/qt-x11-free-3.3.8-odbc.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch
rename to redhat/qt3/qt-x11-free-3.3.8-odbc.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/qt3/qt-x11-free-3.3.8b-typo.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch
rename to redhat/qt3/qt-x11-free-3.3.8b-typo.patch
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
similarity index 100%
rename from redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
rename to redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
diff --git a/redhat/dependencies/qt3/qt.csh b/redhat/qt3/qt.csh
similarity index 100%
rename from redhat/dependencies/qt3/qt.csh
rename to redhat/qt3/qt.csh
diff --git a/redhat/dependencies/qt3/qt.sh b/redhat/qt3/qt.sh
similarity index 100%
rename from redhat/dependencies/qt3/qt.sh
rename to redhat/qt3/qt.sh
diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/qt3/qt3.spec
similarity index 99%
rename from redhat/dependencies/qt3/qt3.spec
rename to redhat/qt3/qt3.spec
index 42840c511..462703918 100644
--- a/redhat/dependencies/qt3/qt3.spec
+++ b/redhat/qt3/qt3.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %if "%{?version}" == ""
-%define version 3.3.8d
+%define version 3.3.8.d
 %endif
 
 # The following QT4 packages should NOT be installed to
@@ -298,7 +298,7 @@ for the Qt 3 toolkit.
 
 
 %prep
-%setup -q -n dependencies/qt3
+%setup -q -n qt3
 %patch1 -p1 -b .cjk
 %patch2 -p1 -b .ndebug
 %patch3 -p1 -b .makefile
diff --git a/redhat/dependencies/qt3/qtconfig3.desktop b/redhat/qt3/qtconfig3.desktop
similarity index 100%
rename from redhat/dependencies/qt3/qtconfig3.desktop
rename to redhat/qt3/qtconfig3.desktop