diff --git a/boost/ChangeLog b/boost/ChangeLog
index 24b24617e0..3067093c7e 100644
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-01  Zvezdan Petkovic  <zvezdan@cs.wm.edu>
+
+	* boost/config/platform/bsd.hpp: config fix for OpenBSD
+
 2004-02-03  Angus Leeming  <leeming@lyx.org>
 
 	* boost/detail/limits.hpp: add support for Itanium machines.
diff --git a/boost/boost/config/platform/bsd.hpp b/boost/boost/config/platform/bsd.hpp
index 0af5364f52..6053d7a2c4 100644
--- a/boost/boost/config/platform/bsd.hpp
+++ b/boost/boost/config/platform/bsd.hpp
@@ -44,7 +44,9 @@
 //
 // The BSD <ctype.h> has macros only, no functions:
 //
-#define BOOST_NO_CTYPE_FUNCTIONS
+#if !defined(__OpenBSD__)
+#  define BOOST_NO_CTYPE_FUNCTIONS
+#endif
 
 //
 // thread API's not auto detected:
diff --git a/config/ChangeLog b/config/ChangeLog
index 2e89e0d9c8..7e7557a9c8 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-01  Zvezdan Petkovic  <zvezdan@cs.wm.edu>
+
+	* qt.m4 (QT_DO_IT_ALL): if the variables MOC or UIC are set, honor
+	their value
+
 2004-02-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.in (VERSION): 
diff --git a/config/qt.m4 b/config/qt.m4
index e8ef8aefbb..ed551ea617 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -199,11 +199,15 @@ AC_DEFUN(QT_DO_IT_ALL,
 	AC_SUBST(QT_INCLUDES)
 	AC_SUBST(QT_LDFLAGS)
  
-	QT_FIND_MOC
-	MOC=$ac_moc
+ 	if test -z "$MOC"; then
+		QT_FIND_MOC
+		MOC=$ac_moc
+	fi
 	AC_SUBST(MOC)
-	QT_FIND_UIC
-	UIC=$ac_uic
+ 	if test -z "$UIC"; then
+		QT_FIND_UIC
+		UIC=$ac_uic
+	fi
 	AC_SUBST(UIC)
 
 	QT_CHECK_COMPILE