diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index ef6ae5d2237c..95aa5471a146 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -34,6 +34,24 @@ pre-everything::
 	@${ECHO} ">>> Warning:  this port needs to be updated as it uses the old-style USE_QT2 variable!"
 .endif
 
+# USE_KDEBASE_VER section
+.if defined(USE_KDEBASE_VER)
+
+# kdebase 1.x common stuff
+.if ${USE_KDEBASE_VER} == 1
+RUN_DEPENDS+=	kcontrol:${PORTSDIR}/x11/kdebase11
+USE_KDELIBS_VER=1
+
+.else
+
+# kdebase 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	konq.4:${PORTSDIR}/x11/kdebase2
+USE_KDELIBS_VER=2
+
+.endif
+.endif
+# End of USE_KDEBASE_VER
+
 # USE_KDELIBS_VER section
 .if defined(USE_KDELIBS_VER)
 
@@ -52,24 +70,6 @@ USE_QT_VER=		2
 .endif
 # End of USE_KDELIBS_VER section
 
-# USE_KDEBASE_VER section
-.if defined(USE_KDEBASE_VER)
-
-# kdebase 1.x common stuff
-.if ${USE_KDEBASE_VER} == 1
-RUN_DEPENDS+=	kcontrol:${PORTSDIR}/x11/kdebase11
-USE_KDELIBS_VER=1
-
-.else
-
-# kdebase 2.x common stuff -- DEFAULT
-LIB_DEPENDS+=	kparts.4:${PORTSDIR}/x11/kdebase2
-USE_KDELIBS_VER=2
-
-.endif
-.endif
-# End of USE_KDEBASE_VER
-
 # USE_QT_VER section
 .if defined(USE_QT_VER)
 
@@ -88,7 +88,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
 .else
 
 QTCPPFLAGS?=
-QTCFLIBS?=
+QTCGFLIBS?=
 
 # Qt 2.x common stuff -- DEFAULT
 LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index ef6ae5d2237c..95aa5471a146 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -34,6 +34,24 @@ pre-everything::
 	@${ECHO} ">>> Warning:  this port needs to be updated as it uses the old-style USE_QT2 variable!"
 .endif
 
+# USE_KDEBASE_VER section
+.if defined(USE_KDEBASE_VER)
+
+# kdebase 1.x common stuff
+.if ${USE_KDEBASE_VER} == 1
+RUN_DEPENDS+=	kcontrol:${PORTSDIR}/x11/kdebase11
+USE_KDELIBS_VER=1
+
+.else
+
+# kdebase 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	konq.4:${PORTSDIR}/x11/kdebase2
+USE_KDELIBS_VER=2
+
+.endif
+.endif
+# End of USE_KDEBASE_VER
+
 # USE_KDELIBS_VER section
 .if defined(USE_KDELIBS_VER)
 
@@ -52,24 +70,6 @@ USE_QT_VER=		2
 .endif
 # End of USE_KDELIBS_VER section
 
-# USE_KDEBASE_VER section
-.if defined(USE_KDEBASE_VER)
-
-# kdebase 1.x common stuff
-.if ${USE_KDEBASE_VER} == 1
-RUN_DEPENDS+=	kcontrol:${PORTSDIR}/x11/kdebase11
-USE_KDELIBS_VER=1
-
-.else
-
-# kdebase 2.x common stuff -- DEFAULT
-LIB_DEPENDS+=	kparts.4:${PORTSDIR}/x11/kdebase2
-USE_KDELIBS_VER=2
-
-.endif
-.endif
-# End of USE_KDEBASE_VER
-
 # USE_QT_VER section
 .if defined(USE_QT_VER)
 
@@ -88,7 +88,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
 .else
 
 QTCPPFLAGS?=
-QTCFLIBS?=
+QTCGFLIBS?=
 
 # Qt 2.x common stuff -- DEFAULT
 LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23