diff -u openmotif-2.3.3/debian/rules openmotif-2.3.3/debian/rules
--- openmotif-2.3.3/debian/rules
+++ openmotif-2.3.3/debian/rules
@@ -14,6 +14,7 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += $(DEB_HOST_GNU_TYPE)
@@ -33,7 +34,7 @@
 
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	CFLAGS="-g -O2 -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 $(CFLAGS_NEW)" ./configure --prefix=/usr --mandir=/usr/share/man --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+	CFLAGS="-g -O2 -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 $(CFLAGS_NEW)" ./configure --prefix=/usr --mandir=/usr/share/man --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 		make;
 		touch build-stamp
 
@@ -63,6 +64,15 @@
 	ln -s /etc/X11/mwm/system.mwmrc debian/tmp/usr/lib/X11/system.mwmrc
 	mkdir -p debian/tmp/usr/lib/X11/bindings/
 
+	# create libmotif3 symlinks
+	ln -s libMrm.so.4.0.3 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libMrm.so.3
+	ln -s libUil.so.4.0.3 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libUil.so.3
+	ln -s libXm.so.4.0.3 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXm.so.3
+
+	# display manager entry for Motif Window Manager
+	mkdir -p debian/tmp/usr/share/xsessions
+	cp -a debian/mwm.desktop debian/tmp/usr/share/xsessions
+
 	# splitup packages
 	dh_movefiles
 
diff -u openmotif-2.3.3/debian/control openmotif-2.3.3/debian/control
--- openmotif-2.3.3/debian/control
+++ openmotif-2.3.3/debian/control
@@ -12,10 +12,12 @@
 Package: libmotif4
 Architecture: any
 Section: non-free/libs
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: x11-common (>= 1:7.0.0)
+Pre-Depends: multiarch-support, x11-common (>= 1:7.0.0)
 Conflicts: libmotif3
 Replaces: libmotif3
+Provides: libmotif3
 Description: Open Motif - shared libraries
  This package includes all files you need to run Motif
  applications which are linked against Open Motif, which
diff -u openmotif-2.3.3/debian/libmotif-dev.files openmotif-2.3.3/debian/libmotif-dev.files
--- openmotif-2.3.3/debian/libmotif-dev.files
+++ openmotif-2.3.3/debian/libmotif-dev.files
@@ -1,7 +1,7 @@
-/usr/lib/libMrm.a
-/usr/lib/libUil.a
-/usr/lib/libXm.a
-/usr/lib/lib*.so
+/usr/lib/*/libMrm.a
+/usr/lib/*/libUil.a
+/usr/lib/*/libXm.a
+/usr/lib/*/lib*.so
 /usr/include/Xm
 /usr/include/Mrm
 /usr/include/uil
diff -u openmotif-2.3.3/debian/changelog openmotif-2.3.3/debian/changelog
--- openmotif-2.3.3/debian/changelog
+++ openmotif-2.3.3/debian/changelog
@@ -1,3 +1,11 @@
+openmotif (2.3.3-5ubuntu1.12.04.1) precise-proposed; urgency=low
+
+  * Convert to multiarch (LP: #1026640). Thanks Sergio Gelato.
+  * Provide backwards compatibility with libmotif3 (LP: #818220).
+  * Provide display manager entry for Motif Window Manager (LP: #310895)
+
+ -- Graham Inggs <graham@nerve.org.za>  Tue, 16 Oct 2012 11:40:17 +0200
+
 openmotif (2.3.3-5ubuntu1) natty; urgency=low
 
   * debian/patches/0003_fix_ftbfs_binutils-gold.patch: fix FTBFS
diff -u openmotif-2.3.3/debian/libmotif4.files openmotif-2.3.3/debian/libmotif4.files
--- openmotif-2.3.3/debian/libmotif4.files
+++ openmotif-2.3.3/debian/libmotif4.files
@@ -1,3 +1,3 @@
-/usr/lib/lib*.so.*
+/usr/lib/*/lib*.so.*
 /usr/lib/X11/bindings
 /usr/include/X11/bitmaps
diff -u openmotif-2.3.3/debian/motif-clients.files openmotif-2.3.3/debian/motif-clients.files
--- openmotif-2.3.3/debian/motif-clients.files
+++ openmotif-2.3.3/debian/motif-clients.files
@@ -7,0 +8,2 @@
+/usr/share/xsessions/mwm.desktop
+
diff -u openmotif-2.3.3/debian/patches/series openmotif-2.3.3/debian/patches/series
--- openmotif-2.3.3/debian/patches/series
+++ openmotif-2.3.3/debian/patches/series
@@ -3,0 +4 @@
+0004-multiarch-specialcase-libdir-X11.patch
only in patch2:
unchanged:
--- openmotif-2.3.3.orig/debian/mwm.desktop
+++ openmotif-2.3.3/debian/mwm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Motif Window Manager
+Comment=Motif Window Manager session
+Exec=mwm
+TryExec=mwm
+Icon=
+Type=Application
only in patch2:
unchanged:
--- openmotif-2.3.3.orig/debian/patches/0004-multiarch-specialcase-libdir-X11.patch
+++ openmotif-2.3.3/debian/patches/0004-multiarch-specialcase-libdir-X11.patch
@@ -0,0 +1,47 @@
+For multiarch support, we change libdir to /usr/lib/$(DEB_HOST_MULTIARCH).
+However, we do not want to do this to /usr/lib/X11 yet.
+
+Note that XMBINDDIR_FALLBACK should really be set to /usr/share/X11/bindings
+since the files are platform-independent. We postpone moving them until a
+decision has been reached on libmotif-common.
+
+The configure.ac fixes are minimal and only suitable for Debian/Ubuntu
+packaging. For upstream one might want to add a command line option.
+
+Sergio Gelato, 2012-05-20.
+--- a/configure
++++ b/configure
+@@ -18786,13 +18786,13 @@
+ LIBDIR="${libdir}/X11"
+ 
+ 
+-MWMRCDIR="${libdir}/X11"
++MWMRCDIR="${prefix}/lib/X11"
+ 
+ 
+ INCDIR="${includedir}/X11"
+ 
+ 
+-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
++XMBINDDIR_FALLBACK="${prefix}/lib/X11/bindings"
+ 
+ 
+ RM="rm -f"
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,13 +179,13 @@
+ LIBDIR="${libdir}/X11"
+ AC_SUBST(LIBDIR)
+ 
+-MWMRCDIR="${libdir}/X11"
++MWMRCDIR="${prefix}/lib/X11"
+ AC_SUBST(MWMRCDIR)
+ 
+ INCDIR="${includedir}/X11"
+ AC_SUBST(INCDIR)
+ 
+-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
++XMBINDDIR_FALLBACK="${prefix}/lib/X11/bindings"
+ AC_SUBST(XMBINDDIR_FALLBACK)
+ 
+ RM="rm -f"