diff --git a/make/qt-defs.mk b/make/qt-defs.mk
index 0d0aa634..91723aba 100644
--- a/make/qt-defs.mk
+++ b/make/qt-defs.mk
@@ -2,28 +2,32 @@ ifeq ($(USE_QT),true)
 
 USE_X                  = true
 CPPFLAGS              += -DQT_THREAD_SUPPORT  
-QT_VERSION            ?= 4
+QT_VERSION             = 4.3.0
+QT_MAJOR_VERSION      ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
 
-ifeq ($(QT_VERSION),2)
-QT_PREFIX              = /usr/lib/qt2
+ifeq ($(QT_MAJOR_VERSION),2)
+	QT_PREFIX              = /usr/lib/qt2
+	INCLUDE               += -I$(QT_PREFIX)/include
 else
-	ifeq ($(QT_VERSION),3)
+	ifeq ($(QT_MAJOR_VERSION),3)
 		QT_PREFIX      = /usr/lib/qt3
+		INCLUDE       += -I$(QT_PREFIX)/include
 	else
-		ifeq ($(QT_VERSION),4)
+		ifeq ($(QT_MAJOR_VERSION),4)
 		QT_PREFIX = $(HOME)/opt/qt4
-		INCLUDE  += -I$(QT_PREFIX)/include/Qt
+		INCLUDE += -I$(QT_PREFIX)/include \
+			$(addprefix -I$(QT_PREFIX)/include/, \
+			Qt Qt3Support QtAssistant QtCore QtDesigner \
+			QtGui QtNetwork QtOpenGL QtScript)
 		endif
 	endif
 endif
 
-INCLUDE               += -I$(QT_PREFIX)/include
-
 ifeq ($(ARCH),x86)
 	LD_LIB_PATH   += $(QT_PREFIX)/lib
 	QT_LDFLAGS    += -L$(QT_PREFIX)/lib
 else
-	ifeq ($(QT_VERSION),4)
+	ifeq ($(QT_MAJOR_VERSION),4)
 		LD_LIB_PATH   += $(QT_PREFIX)/lib
 		QT_LDFLAGS    += -L$(QT_PREFIX)/lib
 	else
@@ -43,7 +47,7 @@ MOC_H_UI               = $(patsubst %.ui,%.h,$(UIFILES))
 MOC_H                  = $(sort $(MOC_H_HC) $(MOC_H_UI))
 MOC_CPP                = $(patsubst %.h,moc_%.cpp,  $(MOC_H))
 RCC_CPP                = $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
-ifeq ($(QT_VERSION),4)
+ifeq ($(QT_MAJOR_VERSION),4)
 UIC_H                  = $(patsubst %.ui,ui_%.h,    $(UIFILES))
 else
 UIC_H                  = $(patsubst %.ui,%.h,       $(UIFILES))
@@ -55,14 +59,14 @@ OBJ                   += $(patsubst %.cpp,%.o,$(UIC_CPP))
 OBJ                   += $(patsubst %.cpp,%.o,$(RCC_CPP))
 
 ifdef REENTRANT
-	ifneq ($(QT_VERSION),4)
+	ifneq ($(QT_MAJOR_VERSION),4)
 	LPPFLAGS      += $(QT_LDFLAGS) -lqt-mt
 	else
 	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
 	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
 	endif
 else
-	ifneq ($(QT_VERSION),4)
+	ifneq ($(QT_MAJOR_VERSION),4)
 	LPPFLAGS      += $(QT_LDFLAGS) -lqt
 	else
 	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
diff --git a/make/qtplugin.mk b/make/qtplugin.mk
index 0116d434..fa850372 100644
--- a/make/qtplugin.mk
+++ b/make/qtplugin.mk
@@ -4,8 +4,8 @@
 # $Id$
 
 USE_QT = true
-ifndef QT_VERSION
-QT_VERSION = 4
+ifndef QT_MAJOR_VERSION
+QT_MAJOR_VERSION = 4
 endif
 
 include $(MODDIR)/make/plugin.mk
diff --git a/make/qtversion.mk b/make/qtversion.mk
index 882eb8a3..3333334c 100644
--- a/make/qtversion.mk
+++ b/make/qtversion.mk
@@ -1,4 +1,4 @@
 USE_QT = true
-ifndef QT_VERSION
-QT_VERSION = 4
+ifndef QT_MAJOR_VERSION
+QT_MAJOR_VERSION = 4
 endif
diff --git a/make/rules.mk b/make/rules.mk
index baf8537c..f4b9df52 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -24,7 +24,7 @@ $(LIBDIR):
 #	$(AR) r $@ $*.o
 #	$(RM) $*.o
 
-ifeq ($(QT_VERSION),3)
+ifeq ($(QT_MAJOR_VERSION),3)
 moc_%.cpp: %.h
 	$(MOC) -o $@ $<
 else
@@ -35,14 +35,14 @@ endif
 rcc_%.cpp: %.qrc
 	$(RCC) -o $@ $<
 
-ifeq ($(QT_VERSION),4)
+ifeq ($(QT_MAJOR_VERSION),4)
 ui_%.h: %.ui 
 else
 %.h: %.ui 
 endif
 	$(UIC) $< -o $@
 
-ifeq ($(QT_VERSION),4)
+ifeq ($(QT_MAJOR_VERSION),4)
 uic_%.cpp: %.h
 	echo -e "#include <$<>\n" > $@
 else