diff --git a/Greenshot/releases/appinfo.ini.template b/Greenshot/releases/appinfo.ini.template
new file mode 100644
index 000000000..6c586fd70
--- /dev/null
+++ b/Greenshot/releases/appinfo.ini.template
@@ -0,0 +1,36 @@
+[Format]
+Type=PortableApps.comFormat
+Version=2.0
+
+[Details]
+Name=Greenshot Portable
+AppID=GreenshotPortable
+Publisher=Greenshot
+Homepage=getgreenshot.org
+Category=Graphics & Pictures
+Description=The great Greenshot tool
+Language=Multilingual
+Trademarks=
+InstallType=
+
+[License]
+Shareable=true
+OpenSource=true
+Freeware=true
+CommercialUse=true
+EULAVersion=true
+
+[Version]
+PackageVersion=1.1.3.$WCREV$
+DisplayVersion=1.1.3.$WCREV$
+
+[SpecialPaths]
+Plugins=NONE
+
+[Dependencies]
+UsesJava=false
+UsesDotNetVersion=2.0
+
+[Control]
+Icons=1
+Start=Greenshot.exe
diff --git a/Greenshot/releases/build.bat b/Greenshot/releases/build.bat
index 0a6a6369f..f0280b616 100644
--- a/Greenshot/releases/build.bat
+++ b/Greenshot/releases/build.bat
@@ -11,7 +11,8 @@ cd ..
 echo Getting current Version
 tools\TortoiseSVN\SubWCRev.exe ..\ releases\additional_files\readme.template.txt releases\additional_files\readme.txt
 tools\TortoiseSVN\SubWCRev.exe ..\ releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\package.bat releases\package-SVN.bat
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\package_zip.bat releases\package_zip-SVN.bat
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\appinfo.ini.template releases\portable\App\AppInfo\appinfo.ini
 cd bin\Release
 del *.log
 echo Making MD5
@@ -22,6 +23,6 @@ pause
 call build_installer.bat
 echo Building zip after key press
 pause
-call package-SVN.bat
+call package_zip-SVN.bat
 echo Finshed
 pause
\ No newline at end of file
diff --git a/Greenshot/releases/package_portable.bat b/Greenshot/releases/package_portable.bat
new file mode 100644
index 000000000..ed461b9d6
--- /dev/null
+++ b/Greenshot/releases/package_portable.bat
@@ -0,0 +1,27 @@
+@echo off
+cd ..
+
+del /q releases\GreenshotPortable*.paf.exe
+del /s /q releases\portable\App\Greenshot\*
+rmdir /s /q releases\portable\App\Greenshot\Languages
+rmdir /s /q releases\portable\App\Greenshot\Plugins
+del /q releases\portable\*.*
+
+pause
+mkdir releases\portable\App\Greenshot\Plugins
+xcopy /S bin\Release\Plugins\* releases\portable\App\Greenshot\Plugins\
+mkdir releases\portable\App\Greenshot\Languages
+xcopy /S Languages\language*.xml releases\portable\App\Greenshot\Languages
+xcopy /S Languages\help*.html releases\portable\App\Greenshot\Languages
+copy Languages\help-en-US.html releases\portable\help.html
+xcopy /S bin\Release\Languages\Plugins\* releases\portable\App\Greenshot\Languages\Plugins\
+
+copy /B bin\Release\checksum.MD5 releases\portable\App\Greenshot
+copy /B bin\Release\GreenshotPlugin.dll releases\portable\App\Greenshot
+copy /B bin\Release\log4net.dll releases\portable\App\Greenshot
+copy /B log4net-portable.xml releases\portable\App\Greenshot
+copy /B bin\Release\Greenshot.exe releases\portable\
+copy /B bin\Release\Greenshot.exe.config releases\portable\
+xcopy /S releases\additional_files\*.txt releases\portable\App\Greenshot
+del releases\portable\App\Greenshot\*.template
+pause
\ No newline at end of file
diff --git a/Greenshot/releases/package.bat b/Greenshot/releases/package_zip.bat
similarity index 100%
rename from Greenshot/releases/package.bat
rename to Greenshot/releases/package_zip.bat
diff --git a/Greenshot/releases/portable/App/AppInfo/appicon.ico b/Greenshot/releases/portable/App/AppInfo/appicon.ico
new file mode 100644
index 000000000..fd1312dec
Binary files /dev/null and b/Greenshot/releases/portable/App/AppInfo/appicon.ico differ
diff --git a/Greenshot/releases/portable/App/AppInfo/appicon_16.png b/Greenshot/releases/portable/App/AppInfo/appicon_16.png
new file mode 100644
index 000000000..31a96bf01
Binary files /dev/null and b/Greenshot/releases/portable/App/AppInfo/appicon_16.png differ
diff --git a/Greenshot/releases/portable/App/AppInfo/appicon_32.png b/Greenshot/releases/portable/App/AppInfo/appicon_32.png
new file mode 100644
index 000000000..5c742d60d
Binary files /dev/null and b/Greenshot/releases/portable/App/AppInfo/appicon_32.png differ
diff --git a/Greenshot/releases/portable/App/DefaultData/Greenshots/dummy.txt b/Greenshot/releases/portable/App/DefaultData/Greenshots/dummy.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/Greenshot/releases/portable/App/DefaultData/Settings/dummy.txt b/Greenshot/releases/portable/App/DefaultData/Settings/dummy.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/Greenshot/releases/portable/Data/Greenshot/dummy.txt b/Greenshot/releases/portable/Data/Greenshot/dummy.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/Greenshot/releases/portable/Data/Settings/dummy.txt b/Greenshot/releases/portable/Data/Settings/dummy.txt
new file mode 100644
index 000000000..e69de29bb