diff --git a/.gitignore b/.gitignore
index 8ec311eb2..8860985e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 /t
 /src/libprojectM/libprojectM.pc
+/build
+/dist
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 3762fa935..f5e0ec0ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS=-I m4
 AM_CPPFLAGS=-DDATADIR_PATH='"${pkgdatadir}"'
 SUBDIRS=src
-PRESETSDIR = presets
+PRESETSDIR=presets
 EXTRA_DIST=README.md AUTHORS.txt presets fonts $(PRESETSDIR)
-CLEANFILES=
+CLEANFILES=dist
 
 # stick apps in bin
 # bin_PROGRAMS = $(top_builddir)/bin
@@ -31,4 +31,16 @@ src/libprojectM/config.inp: src/libprojectM/config.inp.in Makefile
 	chmod a-w $@.tmp && \
 	mv $@.tmp $@
 
-CLEANFILES += src/libprojectM/config.inp
+# do a macOS build
+dist-mac: dist
+	rm -rf dist
+	xcrun xcodebuild -scheme "projectM SDL" -configuration Release archive -archivePath build/ProjectM.xcarchive
+	xcrun xcodebuild -scheme "iProjectM" -configuration Release archive -archivePath build/iTunes.xcarchive
+	mkdir -p dist
+	mv build/ProjectM.xcarchive/Products/Applications/projectM\ SDL.app dist/
+	mv src/projectM-iTunes/iTunes\ Visualizer.pkg dist
+	zip -r9 dist/projectM-SDL-macOS.zip dist/projectM\ SDL.app
+	mv projectM-*.tar.gz dist/
+	@echo "Success!\nBuilt iTunes plugin installer and SDL apps in dist/"
+
+CLEANFILES+=src/libprojectM/config.inp
diff --git a/autogen.sh b/autogen.sh
index 63a7d80da..12acdb196 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
 
-autoreconf --install || exit 1
+echo "Running autoreconf... make sure you have GNU autotools available on your system"
 
-echo "Now run ./configure && make"
+autoreconf --install
+
+echo "You followed directions! Great work!\nNow run ./configure"
diff --git a/configure.ac b/configure.ac
index 228350c6e..3eeb2431f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([projectM], [3.1.1-rc1], [mischa@mvstg.biz], [projectM], [https://github.com/projectM-visualizer/projectm/])
+AC_INIT([projectM], [3.1.1-rc2], [mischa@mvstg.biz], [projectM], [https://github.com/projectM-visualizer/projectm/])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
 
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
diff --git a/projectM.xcworkspace/contents.xcworkspacedata b/projectM.xcworkspace/contents.xcworkspacedata
index b9251df79..05a8aa745 100644
--- a/projectM.xcworkspace/contents.xcworkspacedata
+++ b/projectM.xcworkspace/contents.xcworkspacedata
@@ -8,6 +8,6 @@
       location = "group:src/projectM-sdl/SDLprojectM.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:src/projectM-iTunes/projectM Visualizer.xcodeproj">
+      location = "group:/Users/cyber/dev/projectm/src/projectM-iTunes/iTunes Plugin.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/src/libprojectM/libprojectM.xcodeproj/project.pbxproj b/src/libprojectM/libprojectM.xcodeproj/project.pbxproj
index b4dca4a24..496eeb813 100644
--- a/src/libprojectM/libprojectM.xcodeproj/project.pbxproj
+++ b/src/libprojectM/libprojectM.xcodeproj/project.pbxproj
@@ -907,6 +907,7 @@
 				GCC_OPTIMIZATION_LEVEL = 1;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
+					"GL_SILENCE_DEPRECATION=1",
 					"USE_THREADS=1",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -966,7 +967,10 @@
 				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = "USE_THREADS=1";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"USE_THREADS=1",
+					"GL_SILENCE_DEPRECATION=1",
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
diff --git a/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj b/src/projectM-iTunes/iTunes Plugin.xcodeproj/project.pbxproj
similarity index 98%
rename from src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj
rename to src/projectM-iTunes/iTunes Plugin.xcodeproj/project.pbxproj
index 28ce2ca0d..b03446775 100644
--- a/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj	
+++ b/src/projectM-iTunes/iTunes Plugin.xcodeproj/project.pbxproj	
@@ -331,9 +331,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		C37EBD2A19A0112900220265 /* projectM Visualizer */ = {
+		C37EBD2A19A0112900220265 /* iProjectM Setup */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C37EBD5719A0112900220265 /* Build configuration list for PBXNativeTarget "projectM Visualizer" */;
+			buildConfigurationList = C37EBD5719A0112900220265 /* Build configuration list for PBXNativeTarget "iProjectM Setup" */;
 			buildPhases = (
 				C37EBD2719A0112900220265 /* Sources */,
 				C37EBD2819A0112900220265 /* Frameworks */,
@@ -344,7 +344,7 @@
 			dependencies = (
 				16FE0B2621157D84005F170D /* PBXTargetDependency */,
 			);
-			name = "projectM Visualizer";
+			name = "iProjectM Setup";
 			productName = "projectM Visualizer";
 			productReference = C37EBD2B19A0112900220265 /* projectM Visualizer.app */;
 			productType = "com.apple.product-type.application";
@@ -387,7 +387,7 @@
 					};
 				};
 			};
-			buildConfigurationList = C3F9D7AA17B82CC3009E58CB /* Build configuration list for PBXProject "projectM Visualizer" */;
+			buildConfigurationList = C3F9D7AA17B82CC3009E58CB /* Build configuration list for PBXProject "iTunes Plugin" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -407,7 +407,7 @@
 			projectRoot = "";
 			targets = (
 				C3F9D7AE17B82CC3009E58CB /* iProjectM */,
-				C37EBD2A19A0112900220265 /* projectM Visualizer */,
+				C37EBD2A19A0112900220265 /* iProjectM Setup */,
 			);
 		};
 /* End PBXProject section */
@@ -588,7 +588,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = biz.int80.iProjectM;
+				PRODUCT_BUNDLE_IDENTIFIER = net.projectm.itunes;
 				PRODUCT_NAME = "projectM Visualizer";
 				WRAPPER_EXTENSION = app;
 			};
@@ -633,7 +633,7 @@
 					"$(PROJECT_DIR)/macos/contrib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				PRODUCT_BUNDLE_IDENTIFIER = biz.int80.iProjectM;
+				PRODUCT_BUNDLE_IDENTIFIER = net.projectm.itunes;
 				PRODUCT_NAME = "projectM Visualizer";
 				WRAPPER_EXTENSION = app;
 			};
@@ -824,7 +824,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		C37EBD5719A0112900220265 /* Build configuration list for PBXNativeTarget "projectM Visualizer" */ = {
+		C37EBD5719A0112900220265 /* Build configuration list for PBXNativeTarget "iProjectM Setup" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C37EBD5319A0112900220265 /* Debug */,
@@ -833,7 +833,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C3F9D7AA17B82CC3009E58CB /* Build configuration list for PBXProject "projectM Visualizer" */ = {
+		C3F9D7AA17B82CC3009E58CB /* Build configuration list for PBXProject "iTunes Plugin" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C3F9D7BF17B82CC3009E58CB /* Debug */,
diff --git a/src/projectM-iTunes/projectM Visualizer/projectM Visualizer-Info.plist b/src/projectM-iTunes/projectM Visualizer/projectM Visualizer-Info.plist
index 9ad5006fd..cc18ec635 100644
--- a/src/projectM-iTunes/projectM Visualizer/projectM Visualizer-Info.plist	
+++ b/src/projectM-iTunes/projectM Visualizer/projectM Visualizer-Info.plist	
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>biz.int80.iProjectM</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>3.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>MiSh</string>
 	<key>CFBundleVersion</key>