diff --git a/keepassx.pro b/keepassx1.pro
similarity index 100%
rename from keepassx.pro
rename to keepassx1.pro
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index c3db725..2b5f5f0 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -1,13 +1,13 @@
 # CMake is still experimental, use qmake instead
 
-INSTALL(DIRECTORY keepassx/i18n keepassx/icons
+INSTALL(DIRECTORY keepassx1/i18n keepassx/icons
 	DESTINATION ${SHAREDIR}
 	PATTERN *.qm EXCLUDE
 	PATTERN *~ EXCLUDE
 	PATTERN .svn EXCLUDE
 )
 
-INSTALL(FILES keepassx/license.html DESTINATION ${SHAREDIR})
+INSTALL(FILES keepassx1/license.html DESTINATION ${SHAREDIR})
 
 IF (NOT MINGW AND NOT APPLE)
 	INSTALL(DIRECTORY applications
diff --git a/share/applications/keepassx.desktop b/share/applications/keepassx1.desktop
similarity index 96%
rename from share/applications/keepassx.desktop
rename to share/applications/keepassx1.desktop
index a66c60e..1de29a8 100644
--- a/share/applications/keepassx.desktop
+++ b/share/applications/keepassx1.desktop
@@ -4,7 +4,7 @@ GenericName=Cross Platform Password Manager
 GenericName[de]=Passwortverwaltung
 GenericName[es]=Gestor de contraseñas multiplataforma
 GenericName[fr]=Gestionnaire de mot de passe
-Exec=keepassx %f
+Exec=keepassx1 %f
 Icon=keepassx
 Comment=Cross Platform Password Manager
 Comment[de]=Passwortverwaltung
diff --git a/share/keepassx/i18n/keepassx-de_DE.qm b/share/keepassx1/i18n/keepassx-de_DE.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-de_DE.qm
rename to share/keepassx1/i18n/keepassx-de_DE.qm
diff --git a/share/keepassx/i18n/keepassx-es_ES.qm b/share/keepassx1/i18n/keepassx-es_ES.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-es_ES.qm
rename to share/keepassx1/i18n/keepassx-es_ES.qm
diff --git a/share/keepassx/i18n/keepassx-fi_FI.qm b/share/keepassx1/i18n/keepassx-fi_FI.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-fi_FI.qm
rename to share/keepassx1/i18n/keepassx-fi_FI.qm
diff --git a/share/keepassx/i18n/keepassx-fr_FR.qm b/share/keepassx1/i18n/keepassx-fr_FR.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-fr_FR.qm
rename to share/keepassx1/i18n/keepassx-fr_FR.qm
diff --git a/share/keepassx/i18n/keepassx-gl_ES.qm b/share/keepassx1/i18n/keepassx-gl_ES.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-gl_ES.qm
rename to share/keepassx1/i18n/keepassx-gl_ES.qm
diff --git a/share/keepassx/i18n/keepassx-hu_HU.qm b/share/keepassx1/i18n/keepassx-hu_HU.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-hu_HU.qm
rename to share/keepassx1/i18n/keepassx-hu_HU.qm
diff --git a/share/keepassx/i18n/keepassx-it_IT.qm b/share/keepassx1/i18n/keepassx-it_IT.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-it_IT.qm
rename to share/keepassx1/i18n/keepassx-it_IT.qm
diff --git a/share/keepassx/i18n/keepassx-ja_JP.qm b/share/keepassx1/i18n/keepassx-ja_JP.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-ja_JP.qm
rename to share/keepassx1/i18n/keepassx-ja_JP.qm
diff --git a/share/keepassx/i18n/keepassx-nb_NO.qm b/share/keepassx1/i18n/keepassx-nb_NO.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-nb_NO.qm
rename to share/keepassx1/i18n/keepassx-nb_NO.qm
diff --git a/share/keepassx/i18n/keepassx-nl_NL.qm b/share/keepassx1/i18n/keepassx-nl_NL.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-nl_NL.qm
rename to share/keepassx1/i18n/keepassx-nl_NL.qm
diff --git a/share/keepassx/i18n/keepassx-pl_PL.qm b/share/keepassx1/i18n/keepassx-pl_PL.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-pl_PL.qm
rename to share/keepassx1/i18n/keepassx-pl_PL.qm
diff --git a/share/keepassx/i18n/keepassx-pt_PT.qm b/share/keepassx1/i18n/keepassx-pt_PT.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-pt_PT.qm
rename to share/keepassx1/i18n/keepassx-pt_PT.qm
diff --git a/share/keepassx/i18n/keepassx-ru_RU.qm b/share/keepassx1/i18n/keepassx-ru_RU.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-ru_RU.qm
rename to share/keepassx1/i18n/keepassx-ru_RU.qm
diff --git a/share/keepassx/i18n/keepassx-sk_SK.qm b/share/keepassx1/i18n/keepassx-sk_SK.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-sk_SK.qm
rename to share/keepassx1/i18n/keepassx-sk_SK.qm
diff --git a/share/keepassx/i18n/keepassx-sr_RS.qm b/share/keepassx1/i18n/keepassx-sr_RS.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-sr_RS.qm
rename to share/keepassx1/i18n/keepassx-sr_RS.qm
diff --git a/share/keepassx/i18n/keepassx-tr_TR.qm b/share/keepassx1/i18n/keepassx-tr_TR.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-tr_TR.qm
rename to share/keepassx1/i18n/keepassx-tr_TR.qm
diff --git a/share/keepassx/i18n/keepassx-uk_UA.qm b/share/keepassx1/i18n/keepassx-uk_UA.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-uk_UA.qm
rename to share/keepassx1/i18n/keepassx-uk_UA.qm
diff --git a/share/keepassx/i18n/keepassx-zh_CN.qm b/share/keepassx1/i18n/keepassx-zh_CN.qm
similarity index 100%
rename from share/keepassx/i18n/keepassx-zh_CN.qm
rename to share/keepassx1/i18n/keepassx-zh_CN.qm
diff --git a/share/keepassx/i18n/qt_fi.qm b/share/keepassx1/i18n/qt_fi.qm
similarity index 100%
rename from share/keepassx/i18n/qt_fi.qm
rename to share/keepassx1/i18n/qt_fi.qm
diff --git a/share/keepassx/i18n/qt_gl_ES.qm b/share/keepassx1/i18n/qt_gl_ES.qm
similarity index 100%
rename from share/keepassx/i18n/qt_gl_ES.qm
rename to share/keepassx1/i18n/qt_gl_ES.qm
diff --git a/share/keepassx/i18n/qt_hu.qm b/share/keepassx1/i18n/qt_hu.qm
similarity index 100%
rename from share/keepassx/i18n/qt_hu.qm
rename to share/keepassx1/i18n/qt_hu.qm
diff --git a/share/keepassx/i18n/qt_it.qm b/share/keepassx1/i18n/qt_it.qm
similarity index 100%
rename from share/keepassx/i18n/qt_it.qm
rename to share/keepassx1/i18n/qt_it.qm
diff --git a/share/keepassx/i18n/qt_nl.qm b/share/keepassx1/i18n/qt_nl.qm
similarity index 100%
rename from share/keepassx/i18n/qt_nl.qm
rename to share/keepassx1/i18n/qt_nl.qm
diff --git a/share/keepassx/i18n/qt_sr.qm b/share/keepassx1/i18n/qt_sr.qm
similarity index 100%
rename from share/keepassx/i18n/qt_sr.qm
rename to share/keepassx1/i18n/qt_sr.qm
diff --git a/share/keepassx/i18n/qt_tr.qm b/share/keepassx1/i18n/qt_tr.qm
similarity index 100%
rename from share/keepassx/i18n/qt_tr.qm
rename to share/keepassx1/i18n/qt_tr.qm
diff --git a/share/keepassx/icons/alarmclock.png b/share/keepassx1/icons/alarmclock.png
similarity index 100%
rename from share/keepassx/icons/alarmclock.png
rename to share/keepassx1/icons/alarmclock.png
diff --git a/share/keepassx/icons/appsettings.png b/share/keepassx1/icons/appsettings.png
similarity index 100%
rename from share/keepassx/icons/appsettings.png
rename to share/keepassx1/icons/appsettings.png
diff --git a/share/keepassx/icons/autotype.png b/share/keepassx1/icons/autotype.png
similarity index 100%
rename from share/keepassx/icons/autotype.png
rename to share/keepassx1/icons/autotype.png
diff --git a/share/keepassx/icons/bookmark.png b/share/keepassx1/icons/bookmark.png
similarity index 100%
rename from share/keepassx/icons/bookmark.png
rename to share/keepassx1/icons/bookmark.png
diff --git a/share/keepassx/icons/bookmark_add.png b/share/keepassx1/icons/bookmark_add.png
similarity index 100%
rename from share/keepassx/icons/bookmark_add.png
rename to share/keepassx1/icons/bookmark_add.png
diff --git a/share/keepassx/icons/bookmark_del.png b/share/keepassx1/icons/bookmark_del.png
similarity index 100%
rename from share/keepassx/icons/bookmark_del.png
rename to share/keepassx1/icons/bookmark_del.png
diff --git a/share/keepassx/icons/bookmark_edit.png b/share/keepassx1/icons/bookmark_edit.png
similarity index 100%
rename from share/keepassx/icons/bookmark_edit.png
rename to share/keepassx1/icons/bookmark_edit.png
diff --git a/share/keepassx/icons/bookmark_folder.png b/share/keepassx1/icons/bookmark_folder.png
similarity index 100%
rename from share/keepassx/icons/bookmark_folder.png
rename to share/keepassx1/icons/bookmark_folder.png
diff --git a/share/keepassx/icons/bookmark_this.png b/share/keepassx1/icons/bookmark_this.png
similarity index 100%
rename from share/keepassx/icons/bookmark_this.png
rename to share/keepassx1/icons/bookmark_this.png
diff --git a/share/keepassx/icons/clientic.png b/share/keepassx1/icons/clientic.png
similarity index 100%
rename from share/keepassx/icons/clientic.png
rename to share/keepassx1/icons/clientic.png
diff --git a/share/keepassx/icons/clock.png b/share/keepassx1/icons/clock.png
similarity index 100%
rename from share/keepassx/icons/clock.png
rename to share/keepassx1/icons/clock.png
diff --git a/share/keepassx/icons/cloneentry.png b/share/keepassx1/icons/cloneentry.png
similarity index 100%
rename from share/keepassx/icons/cloneentry.png
rename to share/keepassx1/icons/cloneentry.png
diff --git a/share/keepassx/icons/copypwd.png b/share/keepassx1/icons/copypwd.png
similarity index 100%
rename from share/keepassx/icons/copypwd.png
rename to share/keepassx1/icons/copypwd.png
diff --git a/share/keepassx/icons/copyusername.png b/share/keepassx1/icons/copyusername.png
similarity index 100%
rename from share/keepassx/icons/copyusername.png
rename to share/keepassx1/icons/copyusername.png
diff --git a/share/keepassx/icons/dbsearch.png b/share/keepassx1/icons/dbsearch.png
similarity index 100%
rename from share/keepassx/icons/dbsearch.png
rename to share/keepassx1/icons/dbsearch.png
diff --git a/share/keepassx/icons/dbsettings.png b/share/keepassx1/icons/dbsettings.png
similarity index 100%
rename from share/keepassx/icons/dbsettings.png
rename to share/keepassx1/icons/dbsettings.png
diff --git a/share/keepassx/icons/delete.png b/share/keepassx1/icons/delete.png
similarity index 100%
rename from share/keepassx/icons/delete.png
rename to share/keepassx1/icons/delete.png
diff --git a/share/keepassx/icons/deleteentry.png b/share/keepassx1/icons/deleteentry.png
similarity index 100%
rename from share/keepassx/icons/deleteentry.png
rename to share/keepassx1/icons/deleteentry.png
diff --git a/share/keepassx/icons/deletegroup.png b/share/keepassx1/icons/deletegroup.png
similarity index 100%
rename from share/keepassx/icons/deletegroup.png
rename to share/keepassx1/icons/deletegroup.png
diff --git a/share/keepassx/icons/dice.png b/share/keepassx1/icons/dice.png
similarity index 100%
rename from share/keepassx/icons/dice.png
rename to share/keepassx1/icons/dice.png
diff --git a/share/keepassx/icons/document.png b/share/keepassx1/icons/document.png
similarity index 100%
rename from share/keepassx/icons/document.png
rename to share/keepassx1/icons/document.png
diff --git a/share/keepassx/icons/down.png b/share/keepassx1/icons/down.png
similarity index 100%
rename from share/keepassx/icons/down.png
rename to share/keepassx1/icons/down.png
diff --git a/share/keepassx/icons/editentry.png b/share/keepassx1/icons/editentry.png
similarity index 100%
rename from share/keepassx/icons/editentry.png
rename to share/keepassx1/icons/editentry.png
diff --git a/share/keepassx/icons/editgroup.png b/share/keepassx1/icons/editgroup.png
similarity index 100%
rename from share/keepassx/icons/editgroup.png
rename to share/keepassx1/icons/editgroup.png
diff --git a/share/keepassx/icons/exit.png b/share/keepassx1/icons/exit.png
similarity index 100%
rename from share/keepassx/icons/exit.png
rename to share/keepassx1/icons/exit.png
diff --git a/share/keepassx/icons/expired.png b/share/keepassx1/icons/expired.png
similarity index 100%
rename from share/keepassx/icons/expired.png
rename to share/keepassx1/icons/expired.png
diff --git a/share/keepassx/icons/fileclose.png b/share/keepassx1/icons/fileclose.png
similarity index 100%
rename from share/keepassx/icons/fileclose.png
rename to share/keepassx1/icons/fileclose.png
diff --git a/share/keepassx/icons/filedelete.png b/share/keepassx1/icons/filedelete.png
similarity index 100%
rename from share/keepassx/icons/filedelete.png
rename to share/keepassx1/icons/filedelete.png
diff --git a/share/keepassx/icons/filenew.png b/share/keepassx1/icons/filenew.png
similarity index 100%
rename from share/keepassx/icons/filenew.png
rename to share/keepassx1/icons/filenew.png
diff --git a/share/keepassx/icons/fileopen.png b/share/keepassx1/icons/fileopen.png
similarity index 100%
rename from share/keepassx/icons/fileopen.png
rename to share/keepassx1/icons/fileopen.png
diff --git a/share/keepassx/icons/filesave.png b/share/keepassx1/icons/filesave.png
similarity index 100%
rename from share/keepassx/icons/filesave.png
rename to share/keepassx1/icons/filesave.png
diff --git a/share/keepassx/icons/filesaveas.png b/share/keepassx1/icons/filesaveas.png
similarity index 100%
rename from share/keepassx/icons/filesaveas.png
rename to share/keepassx1/icons/filesaveas.png
diff --git a/share/keepassx/icons/filesavedisabled.png b/share/keepassx1/icons/filesavedisabled.png
similarity index 100%
rename from share/keepassx/icons/filesavedisabled.png
rename to share/keepassx1/icons/filesavedisabled.png
diff --git a/share/keepassx/icons/generator.png b/share/keepassx1/icons/generator.png
similarity index 100%
rename from share/keepassx/icons/generator.png
rename to share/keepassx1/icons/generator.png
diff --git a/share/keepassx/icons/go-home.png b/share/keepassx1/icons/go-home.png
similarity index 100%
rename from share/keepassx/icons/go-home.png
rename to share/keepassx1/icons/go-home.png
diff --git a/share/keepassx/icons/go-next.png b/share/keepassx1/icons/go-next.png
similarity index 100%
rename from share/keepassx/icons/go-next.png
rename to share/keepassx1/icons/go-next.png
diff --git a/share/keepassx/icons/go-previous.png b/share/keepassx1/icons/go-previous.png
similarity index 100%
rename from share/keepassx/icons/go-previous.png
rename to share/keepassx1/icons/go-previous.png
diff --git a/share/keepassx/icons/groupsearch.png b/share/keepassx1/icons/groupsearch.png
similarity index 100%
rename from share/keepassx/icons/groupsearch.png
rename to share/keepassx1/icons/groupsearch.png
diff --git a/share/keepassx/icons/help.png b/share/keepassx1/icons/help.png
similarity index 100%
rename from share/keepassx/icons/help.png
rename to share/keepassx1/icons/help.png
diff --git a/share/keepassx/icons/help_about.png b/share/keepassx1/icons/help_about.png
similarity index 100%
rename from share/keepassx/icons/help_about.png
rename to share/keepassx1/icons/help_about.png
diff --git a/share/keepassx/icons/i18n.png b/share/keepassx1/icons/i18n.png
similarity index 100%
rename from share/keepassx/icons/i18n.png
rename to share/keepassx1/icons/i18n.png
diff --git a/share/keepassx/icons/keepassx.png b/share/keepassx1/icons/keepassx.png
similarity index 100%
rename from share/keepassx/icons/keepassx.png
rename to share/keepassx1/icons/keepassx.png
diff --git a/share/keepassx/icons/keepassx_large.png b/share/keepassx1/icons/keepassx_large.png
similarity index 100%
rename from share/keepassx/icons/keepassx_large.png
rename to share/keepassx1/icons/keepassx_large.png
diff --git a/share/keepassx/icons/keepassx_locked.png b/share/keepassx1/icons/keepassx_locked.png
similarity index 100%
rename from share/keepassx/icons/keepassx_locked.png
rename to share/keepassx1/icons/keepassx_locked.png
diff --git a/share/keepassx/icons/keepassx_small.png b/share/keepassx1/icons/keepassx_small.png
similarity index 100%
rename from share/keepassx/icons/keepassx_small.png
rename to share/keepassx1/icons/keepassx_small.png
diff --git a/share/keepassx/icons/key.png b/share/keepassx1/icons/key.png
similarity index 100%
rename from share/keepassx/icons/key.png
rename to share/keepassx1/icons/key.png
diff --git a/share/keepassx/icons/lock.png b/share/keepassx1/icons/lock.png
similarity index 100%
rename from share/keepassx/icons/lock.png
rename to share/keepassx1/icons/lock.png
diff --git a/share/keepassx/icons/manual.png b/share/keepassx1/icons/manual.png
similarity index 100%
rename from share/keepassx/icons/manual.png
rename to share/keepassx1/icons/manual.png
diff --git a/share/keepassx/icons/newentry.png b/share/keepassx1/icons/newentry.png
similarity index 100%
rename from share/keepassx/icons/newentry.png
rename to share/keepassx1/icons/newentry.png
diff --git a/share/keepassx/icons/newgroup.png b/share/keepassx1/icons/newgroup.png
similarity index 100%
rename from share/keepassx/icons/newgroup.png
rename to share/keepassx1/icons/newgroup.png
diff --git a/share/keepassx/icons/ok.png b/share/keepassx1/icons/ok.png
similarity index 100%
rename from share/keepassx/icons/ok.png
rename to share/keepassx1/icons/ok.png
diff --git a/share/keepassx/icons/openurl.png b/share/keepassx1/icons/openurl.png
similarity index 100%
rename from share/keepassx/icons/openurl.png
rename to share/keepassx1/icons/openurl.png
diff --git a/share/keepassx/icons/pwd_hide.png b/share/keepassx1/icons/pwd_hide.png
similarity index 100%
rename from share/keepassx/icons/pwd_hide.png
rename to share/keepassx1/icons/pwd_hide.png
diff --git a/share/keepassx/icons/pwd_show.png b/share/keepassx1/icons/pwd_show.png
similarity index 100%
rename from share/keepassx/icons/pwd_show.png
rename to share/keepassx1/icons/pwd_show.png
diff --git a/share/keepassx/icons/restore.png b/share/keepassx1/icons/restore.png
similarity index 100%
rename from share/keepassx/icons/restore.png
rename to share/keepassx1/icons/restore.png
diff --git a/share/keepassx/icons/search.png b/share/keepassx1/icons/search.png
similarity index 100%
rename from share/keepassx/icons/search.png
rename to share/keepassx1/icons/search.png
diff --git a/share/keepassx/icons/swap.png b/share/keepassx1/icons/swap.png
similarity index 100%
rename from share/keepassx/icons/swap.png
rename to share/keepassx1/icons/swap.png
diff --git a/share/keepassx/icons/templates.png b/share/keepassx1/icons/templates.png
similarity index 100%
rename from share/keepassx/icons/templates.png
rename to share/keepassx1/icons/templates.png
diff --git a/share/keepassx/icons/text_block.png b/share/keepassx1/icons/text_block.png
similarity index 100%
rename from share/keepassx/icons/text_block.png
rename to share/keepassx1/icons/text_block.png
diff --git a/share/keepassx/icons/text_bold.png b/share/keepassx1/icons/text_bold.png
similarity index 100%
rename from share/keepassx/icons/text_bold.png
rename to share/keepassx1/icons/text_bold.png
diff --git a/share/keepassx/icons/text_center.png b/share/keepassx1/icons/text_center.png
similarity index 100%
rename from share/keepassx/icons/text_center.png
rename to share/keepassx1/icons/text_center.png
diff --git a/share/keepassx/icons/text_italic.png b/share/keepassx1/icons/text_italic.png
similarity index 100%
rename from share/keepassx/icons/text_italic.png
rename to share/keepassx1/icons/text_italic.png
diff --git a/share/keepassx/icons/text_left.png b/share/keepassx1/icons/text_left.png
similarity index 100%
rename from share/keepassx/icons/text_left.png
rename to share/keepassx1/icons/text_left.png
diff --git a/share/keepassx/icons/text_right.png b/share/keepassx1/icons/text_right.png
similarity index 100%
rename from share/keepassx/icons/text_right.png
rename to share/keepassx1/icons/text_right.png
diff --git a/share/keepassx/icons/text_under.png b/share/keepassx1/icons/text_under.png
similarity index 100%
rename from share/keepassx/icons/text_under.png
rename to share/keepassx1/icons/text_under.png
diff --git a/share/keepassx/icons/trashcan.png b/share/keepassx1/icons/trashcan.png
similarity index 100%
rename from share/keepassx/icons/trashcan.png
rename to share/keepassx1/icons/trashcan.png
diff --git a/share/keepassx/icons/up.png b/share/keepassx1/icons/up.png
similarity index 100%
rename from share/keepassx/icons/up.png
rename to share/keepassx1/icons/up.png
diff --git a/share/keepassx/license.html b/share/keepassx1/license.html
similarity index 100%
rename from share/keepassx/license.html
rename to share/keepassx1/license.html
diff --git a/share/mime/packages/keepassx.xml b/share/mime/packages/keepassx1.xml
similarity index 100%
rename from share/mime/packages/keepassx.xml
rename to share/mime/packages/keepassx1.xml
diff --git a/src/keepassx.h b/src/keepassx1.h
similarity index 100%
rename from src/keepassx.h
rename to src/keepassx1.h
diff --git a/src/src.pro b/src/src.pro
index 0382c03..b546e24 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -44,13 +44,13 @@ unix : !macx : !isEqual(QMAKE_WIN32,1){
 			DEFINES += GLOBAL_AUTOTYPE
 		}
 	}
-	TARGET = ../bin/keepassx
+	TARGET = ../bin/keepassx1
 	target.path = $${PREFIX}/bin
-	datai18n.files = ../share/keepassx/i18n/*.qm
-	datai18n.path = $${PREFIX}/share/keepassx/i18n
-	dataicons.files = ../share/keepassx/icons/*.png
-	dataicons.path = $${PREFIX}/share/keepassx/icons
-	datalicense.files = ../share/keepassx/license.html
+	datai18n.files = ../share/keepassx1/i18n/*.qm
+	datai18n.path = $${PREFIX}/share/keepassx1/i18n
+	dataicons.files = ../share/keepassx1/icons/*.png
+	dataicons.path = $${PREFIX}/share/keepassx1/icons
+	datalicense.files = ../share/keepassx1/license.html
 	datalicense.path = $${PREFIX}/share/keepassx
 	
 	shareapp.files = ../share/applications/*.desktop
@@ -90,7 +90,7 @@ macx {
 	}
 	TARGET = ../bin/KeePassX
 	target.path = $${PREFIX}
-	data.files += ../share/keepassx
+	data.files += ../share/keepassx1
 	data.path = Contents/Resources
 	INSTALLS += data
 	LIBS += -framework CoreFoundation
@@ -134,7 +134,7 @@ isEqual(QMAKE_WIN32,1){
 	isEmpty(PREFIX): PREFIX = "C:/Program\ files/KeePassX"
 	TARGET = ../bin/KeePassX
 	target.path = $${PREFIX}
-	data.files += ../share/keepassx/*
+	data.files += ../share/keepassx1/*
 	data.path = $${PREFIX}/share
 	INSTALLS += data
 	win32-msvc*: LIBS += advapi32.lib
@@ -143,7 +143,7 @@ isEqual(QMAKE_WIN32,1){
 		qt_libs.path = $${PREFIX}
 		INSTALLS += qt_libs
 	}
-	RC_FILE = ../share/win_ico/keepassx.rc
+	RC_FILE = ../share/win_ico/keepassx1.rc
 	QMAKE_LINK_OBJECT_SCRIPT = $${OBJECTS_DIR}/$${QMAKE_LINK_OBJECT_SCRIPT}
 #	SOURCES += main_win32.cpp
 }
@@ -177,27 +177,27 @@ FORMS += forms/AboutDlg.ui \
 #         forms/TrashCanDlg.ui \
          forms/WorkspaceLockedWidget.ui
 
-TRANSLATIONS_KX = translations/keepassx-de_DE.ts \
-                  translations/keepassx-es_ES.ts \
-                  translations/keepassx-fi_FI.ts \
-                  translations/keepassx-fr_FR.ts \
-                  translations/keepassx-gl_ES.ts \
-                  translations/keepassx-hu_HU.ts \
-                  translations/keepassx-it_IT.ts \
-                  translations/keepassx-ja_JP.ts \
-                  translations/keepassx-nb_NO.ts \
-                  translations/keepassx-nl_NL.ts \
-                  translations/keepassx-pl_PL.ts \
-                  translations/keepassx-pt_PT.ts \
-                  translations/keepassx-ru_RU.ts \
-                  translations/keepassx-sk_SK.ts \
-                  translations/keepassx-sr_RS.ts \
-                  translations/keepassx-tr_TR.ts \
-                  translations/keepassx-uk_UA.ts \
-                  translations/keepassx-zh_CN.ts
+TRANSLATIONS_KX = translations/keepassx1-de_DE.ts \
+                  translations/keepassx1-es_ES.ts \
+                  translations/keepassx1-fi_FI.ts \
+                  translations/keepassx1-fr_FR.ts \
+                  translations/keepassx1-gl_ES.ts \
+                  translations/keepassx1-hu_HU.ts \
+                  translations/keepassx1-it_IT.ts \
+                  translations/keepassx1-ja_JP.ts \
+                  translations/keepassx1-nb_NO.ts \
+                  translations/keepassx1-nl_NL.ts \
+                  translations/keepassx1-pl_PL.ts \
+                  translations/keepassx1-pt_PT.ts \
+                  translations/keepassx1-ru_RU.ts \
+                  translations/keepassx1-sk_SK.ts \
+                  translations/keepassx1-sr_RS.ts \
+                  translations/keepassx1-tr_TR.ts \
+                  translations/keepassx1-uk_UA.ts \
+                  translations/keepassx1-zh_CN.ts
 
 # also update in translations_release.sh
-TRANSLATIONS_DISABLED = translations/keepassx-cs_CZ.ts
+TRANSLATIONS_DISABLED = translations/keepassx1-cs_CZ.ts
 
 TRANSLATIONS_QT = translations/qt_fi.ts \
                   translations/qt_gl_ES.ts \
@@ -209,8 +209,8 @@ TRANSLATIONS_QT = translations/qt_fi.ts \
 
 # missing Qt translation: nb_NO
 
-TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-xx_XX.ts
-#TRANSLATIONS_UPDATE = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-xx_XX.ts
+TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx1-xx_XX.ts
+#TRANSLATIONS_UPDATE = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx1-xx_XX.ts
 #TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT
 
 HEADERS += main.h \
@@ -333,11 +333,11 @@ SOURCES += main.cpp \
            export/Export_Txt.cpp
 
 isEqual(PRECOMPILED,0) {
-	QMAKE_CXXFLAGS += -include keepassx.h
+	QMAKE_CXXFLAGS += -include keepassx1.h
 }
 else {
 	CONFIG += precompile_header
-	PRECOMPILED_HEADER = keepassx.h
+	PRECOMPILED_HEADER = keepassx1.h
 }
 
 RESOURCES += res/resources.qrc
@@ -354,8 +354,8 @@ RESOURCES += res/resources.qrc
 
 #exists($$QMAKE_LRELEASE) {
 #	updateqm.input = TRANSLATIONS_COMPILE
-#	updateqm.output = ../share/keepassx/i18n/${QMAKE_FILE_BASE}.qm
-#	updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../share/keepassx/i18n/${QMAKE_FILE_BASE}.qm
+#	updateqm.output = ../share/keepassx1/i18n/${QMAKE_FILE_BASE}.qm
+#	updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../share/keepassx1/i18n/${QMAKE_FILE_BASE}.qm
 #	updateqm.CONFIG += no_link
 #	
 #	QMAKE_EXTRA_COMPILERS += updateqm
diff --git a/src/translations/keepassx-cs_CZ.ts b/src/translations/keepassx1-cs_CZ.ts
similarity index 100%
rename from src/translations/keepassx-cs_CZ.ts
rename to src/translations/keepassx1-cs_CZ.ts
diff --git a/src/translations/keepassx-de_DE.ts b/src/translations/keepassx1-de_DE.ts
similarity index 100%
rename from src/translations/keepassx-de_DE.ts
rename to src/translations/keepassx1-de_DE.ts
diff --git a/src/translations/keepassx-es_ES.ts b/src/translations/keepassx1-es_ES.ts
similarity index 100%
rename from src/translations/keepassx-es_ES.ts
rename to src/translations/keepassx1-es_ES.ts
diff --git a/src/translations/keepassx-fi_FI.ts b/src/translations/keepassx1-fi_FI.ts
similarity index 100%
rename from src/translations/keepassx-fi_FI.ts
rename to src/translations/keepassx1-fi_FI.ts
diff --git a/src/translations/keepassx-fr_FR.ts b/src/translations/keepassx1-fr_FR.ts
similarity index 100%
rename from src/translations/keepassx-fr_FR.ts
rename to src/translations/keepassx1-fr_FR.ts
diff --git a/src/translations/keepassx-gl_ES.ts b/src/translations/keepassx1-gl_ES.ts
similarity index 100%
rename from src/translations/keepassx-gl_ES.ts
rename to src/translations/keepassx1-gl_ES.ts
diff --git a/src/translations/keepassx-hu_HU.ts b/src/translations/keepassx1-hu_HU.ts
similarity index 100%
rename from src/translations/keepassx-hu_HU.ts
rename to src/translations/keepassx1-hu_HU.ts
diff --git a/src/translations/keepassx-it_IT.ts b/src/translations/keepassx1-it_IT.ts
similarity index 100%
rename from src/translations/keepassx-it_IT.ts
rename to src/translations/keepassx1-it_IT.ts
diff --git a/src/translations/keepassx-ja_JP.ts b/src/translations/keepassx1-ja_JP.ts
similarity index 100%
rename from src/translations/keepassx-ja_JP.ts
rename to src/translations/keepassx1-ja_JP.ts
diff --git a/src/translations/keepassx-nb_NO.ts b/src/translations/keepassx1-nb_NO.ts
similarity index 100%
rename from src/translations/keepassx-nb_NO.ts
rename to src/translations/keepassx1-nb_NO.ts
diff --git a/src/translations/keepassx-nl_NL.ts b/src/translations/keepassx1-nl_NL.ts
similarity index 100%
rename from src/translations/keepassx-nl_NL.ts
rename to src/translations/keepassx1-nl_NL.ts
diff --git a/src/translations/keepassx-pl_PL.ts b/src/translations/keepassx1-pl_PL.ts
similarity index 100%
rename from src/translations/keepassx-pl_PL.ts
rename to src/translations/keepassx1-pl_PL.ts
diff --git a/src/translations/keepassx-pt_PT.ts b/src/translations/keepassx1-pt_PT.ts
similarity index 100%
rename from src/translations/keepassx-pt_PT.ts
rename to src/translations/keepassx1-pt_PT.ts
diff --git a/src/translations/keepassx-ru_RU.ts b/src/translations/keepassx1-ru_RU.ts
similarity index 100%
rename from src/translations/keepassx-ru_RU.ts
rename to src/translations/keepassx1-ru_RU.ts
diff --git a/src/translations/keepassx-sk_SK.ts b/src/translations/keepassx1-sk_SK.ts
similarity index 100%
rename from src/translations/keepassx-sk_SK.ts
rename to src/translations/keepassx1-sk_SK.ts
diff --git a/src/translations/keepassx-sr_RS.ts b/src/translations/keepassx1-sr_RS.ts
similarity index 100%
rename from src/translations/keepassx-sr_RS.ts
rename to src/translations/keepassx1-sr_RS.ts
diff --git a/src/translations/keepassx-tr_TR.ts b/src/translations/keepassx1-tr_TR.ts
similarity index 100%
rename from src/translations/keepassx-tr_TR.ts
rename to src/translations/keepassx1-tr_TR.ts
diff --git a/src/translations/keepassx-uk_UA.ts b/src/translations/keepassx1-uk_UA.ts
similarity index 100%
rename from src/translations/keepassx-uk_UA.ts
rename to src/translations/keepassx1-uk_UA.ts
diff --git a/src/translations/keepassx-xx_XX.ts b/src/translations/keepassx1-xx_XX.ts
similarity index 100%
rename from src/translations/keepassx-xx_XX.ts
rename to src/translations/keepassx1-xx_XX.ts
diff --git a/src/translations/keepassx-zh_CN.ts b/src/translations/keepassx1-zh_CN.ts
similarity index 100%
rename from src/translations/keepassx-zh_CN.ts
rename to src/translations/keepassx1-zh_CN.ts
diff --git a/translations_release.sh b/translations_release.sh
index 5887e8a..3e93883 100755
--- a/translations_release.sh
+++ b/translations_release.sh
@@ -14,9 +14,9 @@ if [ "$LRELEASE" = "" ] ; then
 fi
 
 cd `dirname $0`
-rm share/keepassx/i18n/*.qm
+rm share/keepassx1/i18n/*.qm
 cd src
 $LRELEASE translations/*.ts
-mv translations/*.qm ../share/keepassx/i18n
-rm ../share/keepassx/i18n/keepassx-xx_XX.qm
-rm ../share/keepassx/i18n/keepassx-cs_CZ.qm
+mv translations/*.qm ../share/keepassx1/i18n
+rm ../share/keepassx/i18n/keepassx1-xx_XX.qm
+rm ../share/keepassx/i18n/keepassx1-cs_CZ.qm
diff --git a/translations_update.sh b/translations_update.sh
index 5ac1387..9e9cc5a 100755
--- a/translations_update.sh
+++ b/translations_update.sh
@@ -14,5 +14,5 @@ if [ "$LUPDATE" = "" ] ; then
 fi
 
 cd `dirname $0`/src
-rm translations/keepassx-xx_XX.ts
+rm translations/keepassx1-xx_XX.ts
 $LUPDATE src.pro