diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 0447e9856f2..abfd9b9471e 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.55 2012/10/29 09:47:05 landry Exp $
+# $OpenBSD: Makefile,v 1.56 2012/10/29 12:16:48 sthen Exp $
 
 COMMENT-main=		Motif toolkit
 COMMENT-demos=		Motif toolkit demos
 
 VERSION=		2.3.4
+REVISION-main=		0
 DISTNAME=		motif-${VERSION}
 EXTRACT_SUFX=		-src.tgz
 PKGNAME-main=		openmotif-${VERSION}
@@ -27,7 +28,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MULTI_PACKAGES=		-demos -main
 
-USE_GROFF =		Yes
+USE_GROFF=		Yes
 CONFIGURE_STYLE=	gnu
 AUTOCONF_VERSION=	2.69
 AUTOMAKE_VERSION=	1.12
@@ -38,6 +39,8 @@ CONFIGURE_ARGS=		--enable-themes \
 			--enable-png
 CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib -lm"
+MAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
 
 USE_LIBTOOL=		Yes
 
@@ -65,7 +68,7 @@ WANTLIB-demos=		${WANTLIB} Xm Mrm
 # XXX  Large, complicated, only partially automated test suite available
 NO_REGRESS=	Yes
 
-do-configure:
+pre-patch:
 	cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
 
 pre-configure:
diff --git a/x11/openmotif/patches/patch-autogen_sh b/x11/openmotif/patches/patch-autogen_sh
new file mode 100644
index 00000000000..125af15ed70
--- /dev/null
+++ b/x11/openmotif/patches/patch-autogen_sh
@@ -0,0 +1,12 @@
+$OpenBSD: patch-autogen_sh,v 1.1 2012/10/29 12:16:48 sthen Exp $
+--- autogen.sh.orig	Mon Oct 29 11:06:11 2012
++++ autogen.sh	Mon Oct 29 11:06:39 2012
+@@ -13,6 +13,8 @@ autoconf
+ autoheader
+ automake --foreign  --include-deps --add-missing
+ 
++exit 0
++
+ if test -z "$*"; then
+         echo "I am going to run ./configure with no arguments - if you wish "
+         echo "to pass any to it, please specify them on the $0 command line."