diff --git a/ChangeLog b/ChangeLog
index 8bd2e591..cf561a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-3.2.3
+3.3.1
 
 TODO: Mac OS 64bit support
 
+
+3.3.0
+
+- renamed the software from llcon to Jamulus
+
 - support for an instrument picture on the fader tag
 
 - a server welcome message can be shown on a connect to the
diff --git a/linux/deploy_linux.sh b/linux/deploy_linux.sh
index 45df1595..ceb4ab5f 100755
--- a/linux/deploy_linux.sh
+++ b/linux/deploy_linux.sh
@@ -6,5 +6,5 @@ qmake llcon.pro
 make -j2
 make dist
 
-mv *.tar.gz deploy/llcon-version.tar.gz
+mv *.tar.gz deploy/Jamulus-version.tar.gz
 cd linux
diff --git a/llcon.pro b/llcon.pro
index d998a307..7533c5e3 100755
--- a/llcon.pro
+++ b/llcon.pro
@@ -1,4 +1,4 @@
-TARGET = llcon
+TARGET = Jamulus
 
 CONFIG += qt \
     thread \
diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh
index 6bbba513..7cb131ec 100755
--- a/mac/deploy_mac.sh
+++ b/mac/deploy_mac.sh
@@ -7,21 +7,21 @@ cd ..
 
 
 # first clean up
-rm -rf llcon.app
+rm -rf Jamulus.app
 make clean
 
 # make everything
 make -j2
 
 # call qt mac deploy tool
-macdeployqt llcon.app -dmg
+macdeployqt Jamulus.app -dmg
 
 # create zip file including COPYING file
-zip llcon-version-mac.zip llcon.dmg COPYING
+zip Jamulus-version-mac.zip Jamulus.dmg COPYING
 
 # move new file in deploy directory
-mv llcon-version-mac.zip deploy/llcon-version-mac.zip
+mv Jamulus-version-mac.zip deploy/Jamulus-version-mac.zip
 
 # cleanup and go back to original directory
-rm llcon.dmg
+rm Jamulus.dmg
 cd mac
diff --git a/src/global.h b/src/global.h
index 9adeb50b..264e4933 100755
--- a/src/global.h
+++ b/src/global.h
@@ -71,8 +71,8 @@ LED bar:      lbr
 
 // version and application name (always use this version)
 #undef VERSION
-#define VERSION                         "3.2.3cvs"
-#define APP_NAME                        "llcon"
+#define VERSION                         "3.3.0cvs"
+#define APP_NAME                        "Jamulus"
 
 // Windows registry key name of auto run entry for the server
 #define AUTORUN_SERVER_REG_NAME         "llcon server"
diff --git a/src/res/logopicture.png b/src/res/logopicture.png
index fdeef716..97308bbe 100755
Binary files a/src/res/logopicture.png and b/src/res/logopicture.png differ
diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat
index 8adca7d0..741161dc 100755
--- a/windows/deploy_windows.bat
+++ b/windows/deploy_windows.bat
@@ -11,14 +11,14 @@ set QMAKESPEC=win32-msvc2010
 qmake -tp vc
 
 rem clean and compile solution -------------------------------------------------
-vcexpress llcon.vcxproj /clean "Release|Win32"
-vcexpress llcon.vcxproj /build "Release|Win32"
+vcexpress Jamulus.vcxproj /clean "Release|Win32"
+vcexpress Jamulus.vcxproj /build "Release|Win32"
 
 rem create installer -----------------------------------------------------------
 cd windows
 "%NSIS_PATH%\makensis.exe" installer.nsi
 
-move llconinstaller.exe ../deploy/llcon-version-installer.exe
+move Jamulusinstaller.exe ../deploy/Jamulus-version-installer.exe
 
 goto endofskript
 
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 79193bae..64a10f91 100755
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -1,10 +1,10 @@
 ; llcon NSIS installer script
 
-!define APP_NAME          "Llcon"
-!define APP_EXE			  "llcon.exe"
+!define APP_NAME          "Jamulus"
+!define APP_EXE           "Jamulus.exe"
 !define AUTORUN_NAME      "llcon server"
 !define UNINSTALL_EXE     "Uninstall.exe"
-!define INSTALLER_NAME    "llconinstaller.exe"
+!define INSTALLER_NAME    "Jamulusinstaller.exe"
 !define BINARY_PATH       "..\release\"
 !define VS_REDIST_PATH    "C:\Program Files\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\"
 ;!define VS_REDIST_PATH   "C:\Programme\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\"
@@ -73,7 +73,7 @@ Section
 
   CreateDirectory  "$SMPROGRAMS\${APP_NAME}"
   CreateShortCut   "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}"
-  CreateShortCut   "$SMPROGRAMS\${APP_NAME}\${APP_NAME} server.lnk" "$INSTDIR\${APP_EXE}" "-s"
+  CreateShortCut   "$SMPROGRAMS\${APP_NAME}\${APP_NAME} Server.lnk" "$INSTDIR\${APP_EXE}" "-s"
   CreateShortCut   "$SMPROGRAMS\${APP_NAME}\${UNINSTALL_EXE}.lnk" "$INSTDIR\${UNINSTALL_EXE}"
 
   ; cleanup: remove temporary Microsoft Visual Studio redistributable executable
@@ -120,6 +120,7 @@ Delete $INSTDIR\libGLESv2.dll
 Delete $INSTDIR\COPYING
 Delete $INSTDIR\platforms\qwindows.dll
 Delete $INSTDIR\platforms\qminimal.dll
+RMDir  $INSTDIR\platforms
 Delete $INSTDIR\accessible\qtaccessiblewidgets.dll
 RMDir  $INSTDIR\accessible
 RMDir  $INSTDIR