diff --git a/admin/mac/Info.plist b/admin/mac/Info.plist
index d4427dc89..64d3a7773 100644
--- a/admin/mac/Info.plist
+++ b/admin/mac/Info.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -23,42 +23,42 @@
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
-    <string>10.5.0</string>
-    <key>SUFeedURL</key>
-    <string>http://download.tomahawk-player.org/sparkle/update.php</string>
-    <key>SUPublicDSAKeyFile</key>
-    <string>sparkle_pub.pem</string>
-    <key>SUEnableSystemProfiling</key>
-    <string>YES</string>
-    <key>CFBundleURLTypes</key>
-        <array>
-            <dict>
-                <key>CFBundleURLName</key>
-                <string>Tomahawk URL</string>
-                <key>CFBundleURLSchemes</key>
-                <array>
-                    <string>tomahawk</string>
-                </array>
-            </dict>
-        </array>
-    <key>CFBundleDocumentTypes</key>
-      <array>
-        <dict>
-          <key>CFBundleTypeExtensions</key>
-          <array>
-            <string>xspf</string>
-          </array>
-          <key>CFBundleTypeIconFile</key>
-          <string>Generic.icns</string>
-          <key>CFBundleTypeMIMETypes</key>
-          <array>
-            <string>application/xspf+xml</string>
-          </array>
-          <key>CFBundleTypeName</key>
-          <string>XSPF Playlist</string>
-          <key>CFBundleTypeRole</key>
-          <string>Viewer</string>
-        </dict>
-      </array>
+	<string>10.5.0</string>
+	<key>SUFeedURL</key>
+	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>sparkle_pub.pem</string>
+	<key>SUEnableSystemProfiling</key>
+	<true/>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Tomahawk URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tomahawk</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>xspf</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>Generic.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/xspf+xml</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>XSPF Playlist</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
 </dict>
 </plist>
diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh
index c3dcbcd83..3d59b146a 100755
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -39,6 +39,8 @@ VERSION=$1
     mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
     cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
 
+    header "Copying Sparkle framework"
+    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
 
     header "Creating DMG"
     cd ..
diff --git a/src/mac/tomahawkapp_mac.mm b/src/mac/tomahawkapp_mac.mm
index 4ee701334..9774609e5 100644
--- a/src/mac/tomahawkapp_mac.mm
+++ b/src/mac/tomahawkapp_mac.mm
@@ -20,6 +20,7 @@
 
 #include "macdelegate.h"
 #include "macshortcuthandler.h"
+#include "config.h"
 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSAutoreleasePool.h>
diff --git a/thirdparty/libportfwd/src/portfwd.cpp b/thirdparty/libportfwd/src/portfwd.cpp
index a7614e863..bd339d97b 100644
--- a/thirdparty/libportfwd/src/portfwd.cpp
+++ b/thirdparty/libportfwd/src/portfwd.cpp
@@ -113,7 +113,7 @@ Portfwd::get_status()
 //    Q_ASSERT(urls->controlURL_CIF != NULL);
     // get connection speed
     UPNP_GetLinkLayerMaxBitRates(
-        urls->controlURL_CIF, data->CIF.servicetype, &m_downbps, &m_upbps);
+        urls->controlURL_CIF, data->first.servicetype, &m_downbps, &m_upbps);
 
     // get external IP adress
     char ip[16];