diff --git a/make/defs.mk b/make/defs.mk
index 59a52ec2..826a61b9 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -149,13 +149,23 @@ INSTALLED_SHOBJS  = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
 ifeq ($(USE_QT),true)
 USE_X = true 
 
-MOC = /usr/lib/qt2/bin/moc
-UIC = /usr/lib/qt2/bin/uic
+ifeq ($(QT_VERSION),3)
+QT_PREFIX = /usr/lib/qt3
+else
+QT_PREFIX = /usr/lib/qt2
+endif
+
+MOC = $(QT_PREFIX)/bin/moc
+UIC = $(QT_PREFIX)/bin/uic
 
 MOC_CPP   = $(patsubst %.h,moc_%.cpp,$(MOC_HEADER))
 OBJ      += $(patsubst %.cpp,%.o,$(MOC_CPP))
-LPPFLAGS += -L/usr/lib/qt2/lib -lqt
-INCLUDE  += -I/usr/lib/qt2/include
+ifdef REENTRANT
+LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt
+else
+LPPFLAGS += -L$(QT_PREFIX)/lib -lqt
+endif
+INCLUDE  += -I$(QT_PREFIX)/include
 endif
 
 ifeq ($(USE_X),true)