diff --git a/openhantek/ChangeLog b/openhantek/ChangeLog
index babe33e..0090841 100644
--- a/openhantek/ChangeLog
+++ b/openhantek/ChangeLog
@@ -78,3 +78,6 @@
 * Made export dialog title translatable
 * Fixed export shortcut
 * Added csv export
+
+2010-09-15  Oliver Haag  <oliver.haag@gmail.com>
+* Added OSX patches by Florian Schirmer <jolt@tuxbox.org>, thanks :)
diff --git a/openhantek/OpenHantek.pro b/openhantek/OpenHantek.pro
index 00f5f14..4df9235 100644
--- a/openhantek/OpenHantek.pro
+++ b/openhantek/OpenHantek.pro
@@ -58,6 +58,7 @@ DISTFILES += ChangeLog \
     COPYING \
     INSTALL \
     res/images/*.png \
+    res/images/*.icns \
     res/images/*.svg \
     translations/*.qm \
     translations/*.ts \
@@ -105,7 +106,7 @@ unix:!macx {
     translations.path = $${PREFIX}/share/apps/openhantek/translations
     INCLUDEPATH += /usr/include/libusb
     DEFINES += QMAKE_TRANSLATIONS_PATH=\\\"$${translations.path}\\\" \
-        OS_UNIX
+        OS_UNIX VERSION=\\\"$${VERSION}\\\"
 }
 macx { 
     isEmpty(PREFIX):PREFIX = OpenHantek.app
@@ -114,8 +115,11 @@ macx {
     # Installation directories
     target.path = $${PREFIX}/Contents/MacOS
     translations.path = $${PREFIX}/Contents/Resources/translations
-    DEFINES += QMAKE_TRANSLATIONS_PATH=\\\"Contents/Resources/translations\\\" \
-        OS_DARWIN
+    INCLUDEPATH += src
+    LIBS += -framework IOKit -framework CoreFoundation
+    ICON = res/images/openhantek.icns
+    DEFINES += QMAKE_TRANSLATIONS_PATH=\"Contents/Resources/translations\" \
+        OS_DARWIN VERSION=\"$${VERSION}\"
 }
 win32 { 
     isEmpty(PREFIX):PREFIX = OpenHantek
@@ -125,12 +129,11 @@ win32 {
     target.path = $${PREFIX}
     translations.path = $${PREFIX}/translations
     DEFINES += QMAKE_TRANSLATIONS_PATH=\\\"translations\\\" \
-        OS_WINDOWS
+        OS_WINDOWS VERSION=\\\"$${VERSION}\\\"
 }
 translations.files += translations/*.qm
 INSTALLS += target \
     translations
-DEFINES += VERSION=\\\"$${VERSION}\\\"
 
 # Custom target "doc" for Doxygen
 doxygen.target = doc
diff --git a/openhantek/res/images/openhantek.icns b/openhantek/res/images/openhantek.icns
new file mode 100644
index 0000000..6ac5fba
--- /dev/null
+++ b/openhantek/res/images/openhantek.icns
diff --git a/openhantek/src/dsowidget.cpp b/openhantek/src/dsowidget.cpp
index 9d0220c..75093b5 100644
--- a/openhantek/src/dsowidget.cpp
+++ b/openhantek/src/dsowidget.cpp
@@ -443,6 +443,7 @@ bool DsoWidget::exportAs() {
 	
 	QFileDialog fileDialog((QWidget *) this->parent(), tr("Export file..."), QString(), filters.join(";;"));
 	fileDialog.setFileMode(QFileDialog::AnyFile);
+	fileDialog.setAcceptMode(QFileDialog::AcceptSave);
 	if(fileDialog.exec() != QDialog::Accepted)
 		return false;