diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index ebbe69c44114..b111b8a717da 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mowitz
-PORTVERSION=	0.1.0
+PORTVERSION=	0.1.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://siag.nu/pub/mowitz/
 
@@ -13,12 +13,19 @@ MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	CPPFLAGS="-Dcfree=free"
+CONFIGURE_ARGS=	--with-xawm=Xaw3d
+
+.if defined(X11BASE) && ${X11BASE} != /usr/X11R6
+post-patch:
+	${PERL} -pi -e 's,/usr/X11R6,${X11BASE},g' \
+		`find ${WRKSRC} | xargs fgrep -l --mmap /usr/X11R6`
+.endif
 
 post-install:
 	${RM} ${PREFIX}/lib/libMowitz.la
+# Anyone knows a better way?
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/mowitz/distinfo b/x11-toolkits/mowitz/distinfo
index 3cfff295561f..71f95e7d18a5 100644
--- a/x11-toolkits/mowitz/distinfo
+++ b/x11-toolkits/mowitz/distinfo
@@ -1 +1 @@
-MD5 (Mowitz-0.1.0.tar.gz) = e74d86bfacbc95ea8ef9a8635a6438d7
+MD5 (Mowitz-0.1.1.tar.gz) = 680106c783162e60f03d944cfe4933ee
diff --git a/x11-toolkits/mowitz/files/patch-aa b/x11-toolkits/mowitz/files/patch-aa
deleted file mode 100644
index ee86a4f77206..000000000000
--- a/x11-toolkits/mowitz/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/Makefile.in	Mon Jan  7 10:43:48 2002
-+++ examples/Makefile.in	Mon Jan  7 17:21:53 2002
-@@ -84,5 +84,5 @@
- 
--INCLUDES = -I.. -DNARROWPROTO -DNeedFunctionPrototypes -DUSE_XPM
-+INCLUDES = -I.. -DNARROWPROTO -DNeedFunctionPrototypes -DUSE_XPM @X_CFLAGS@
- 
--LDADD = ../Mowitz/.libs/libMowitz.a -L/usr/X11R6/lib -lXawM -lXpm -lXmu -lXext -lXt -lX11
-+LDADD = ../Mowitz/.libs/libMowitz.a -L/usr/X11R6/lib -lXaw3d -lXpm -lXmu -lXext -lXt -lX11
-