Index: Makefile.am
===================================================================
--- Makefile.am (revision 4288)
+++ Makefile.am (working copy)
@@ -1,4 +1,46 @@
 # Main Makefile for DOSBox

-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh  \
+           Info.plist.in
 SUBDIRS = src include docs visualc_net
+
+if MACOSX
+
+bundle_name = DOSBoxSVN.app
+dmg_name = DOSBox-snapshot
+# $(INSTALL_PROGRAM) $< $(bundle_name)/Contents/MacOS/
+# $(INSTALL_DATA) $(srcdir)/src/platform/macosx/dosbox.icns $(bundle_name)/Contents/Resources/
+bundle: ${EXE_TARGET}
+   mkdir -p $(bundle_name)/Contents/MacOS
+   mkdir -p $(bundle_name)/Contents/Resources
+   mkdir -p $(bundle_name)/Contents/Documents
+   cp $(srcdir)/src/$(PACKAGE) $(bundle_name)/Contents/MacOS/
+   echo "APPL????" > $(bundle_name)/Contents/PkgInfo
+   cp $(srcdir)/Info.plist $(bundle_name)/Contents/
+   cp $(srcdir)/src/platform/macos/dosbox.icns $(bundle_name)/Contents/Resources/
+   cp $(srcdir)/AUTHORS $(bundle_name)/Contents/Documents
+   cp $(srcdir)/COPYING $(bundle_name)/Contents/Documents
+   cp $(srcdir)/NEWS $(bundle_name)/Contents/Documents
+   cp $(srcdir)/README $(bundle_name)/Contents/Documents
+   cp $(srcdir)/THANKS $(bundle_name)/Contents/Documents
+
+
+osxdmg: bundle
+   mkdir -p $(dmg_name)
+   cp $(srcdir)/AUTHORS ./$(dmg_name)/Authors
+   cp $(srcdir)/COPYING ./$(dmg_name)/License
+   cp $(srcdir)/NEWS ./$(dmg_name)/News
+   cp $(srcdir)/README ./$(dmg_name)/ReadMe
+   cp $(srcdir)/THANKS ./$(dmg_name)/Thanks
+   SetFile -t ttro -c ttxt ./$(dmg_name)/Authors
+   SetFile -t ttro -c ttxt ./$(dmg_name)/License
+   SetFile -t ttro -c ttxt ./$(dmg_name)/News
+   SetFile -t ttro -c ttxt ./$(dmg_name)/ReadMe
+   SetFile -t ttro -c ttxt ./$(dmg_name)/Thanks
+   cp -R $(bundle_name) ./$(dmg_name)/
+   hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
+                   -srcfolder $(dmg_name) \
+                   -volname "DOSBox SVN snapshot$(REVISION)" \
+                   $(dmg_name).dmg
+   rm -rf $(dmg_name)
+endif
\ No newline at end of file
Index: configure.ac
===================================================================
--- configure.ac    (revision 4288)
+++ configure.ac    (working copy)
@@ -591,6 +591,7 @@
        dnl to do more to distinguish them.
        dnl For now I am lazy and do not add proper detection code.
        AC_DEFINE(MACOSX, 1, [Compiling on Mac OS X])
+      AM_CONDITIONAL(MACOSX, [true])
        AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).])
        ;;
     *-*-linux*)
@@ -653,4 +654,6 @@
 include/Makefile
 docs/Makefile
 ])
-AC_OUTPUT
+AC_OUTPUT([
+Info.plist
+])