diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index dbd85de..af3d8ad 100644
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -56,6 +56,8 @@ Component	Component
 compwxstd.mo.sl_SI	{A5FEEA94-08CA-4E12-993F-A115601EF258}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.sl_SI
 compLocalizationRepositoryPath	{0E96110A-C38D-4600-9AE2-B8B59AF53A00}	ZRCOLALOCDIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regLocalizationRepositoryPath
 compLanguage	{B78359AC-9484-402C-8384-3A4595B39389}	ZRCOLALOCDIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regLanguage
+compDatabasePath	{DF3C720D-50BB-4377-9EE0-9AC21C02B9DD}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regDatabasePath
+compZRCola.zrcdb	{0585A51F-1411-43A3-AC50-F04A253FDED4}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.zrcdb
 comp00_ZRCola_Re.ttf	{B6CE8B39-11DC-4B59-B10C-3F0FFE8F81AF}	FontsFolder	0		file00_ZRCola_Re.ttf
 comp00_ZRCola_It.ttf	{10613965-2874-470D-9D5A-B7D535AA3317}	FontsFolder	0		file00_ZRCola_It.ttf
 comp00_ZRCola_Bd.ttf	{C036BE8D-6D2F-4DBF-99D6-F53702EAEBB6}	FontsFolder	0		file00_ZRCola_Bd.ttf
@@ -142,6 +144,7 @@ ZRCOLABINDIR	ZRCOLADIR	.:X64~1.REL|x64.Release
 !ENDIF
 ZRCOLALOCDIR	ZRCOLADIR	locale
 ZRCOLALOCSLSIDIR	ZRCOLALOCDIR	sl_SI
+ZRCOLADATADIR	ZRCOLADIR	data
 <<NOKEEP
 
 "En.$(PLAT).$(CFG).Directory-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
@@ -224,6 +227,7 @@ File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
 File	File
 filewxstd.mo.sl_SI	compwxstd.mo.sl_SI	wxstd.mo	0		1060	0	1
+fileZRCola.zrcdb	compZRCola.zrcdb	ZRCOLA~1.ZRC|ZRCola.zrcdb	0			0	1
 file00_ZRCola_Re.ttf	comp00_ZRCola_Re.ttf	00_ZRC~1.TTF|00_ZRCola_Re.ttf	0			0	1
 file00_ZRCola_It.ttf	comp00_ZRCola_It.ttf	00_ZRC~2.TTF|00_ZRCola_It.ttf	0			0	1
 file00_ZRCola_Bd.ttf	comp00_ZRCola_Bd.ttf	00_ZRC~3.TTF|00_ZRCola_Bd.ttf	0			0	1
@@ -329,6 +333,7 @@ Registry	Root	Key	Name	Value	Component_
 s$(MSIBUILD_LENGTH_ID)	i2	l255	L255	L0	s$(MSIBUILD_LENGTH_ID)
 Registry	Registry
 regLocalizationRepositoryPath	2	SOFTWARE\Amebis\ZRCola	LocalizationRepositoryPath	[ZRCOLALOCDIR]	compLocalizationRepositoryPath
+regDatabasePath	2	SOFTWARE\Amebis\ZRCola	DatabasePath	[ZRCOLADATADIR]	compDatabasePath
 <<NOKEEP
 
 "En.$(PLAT).$(CFG).Registry-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
diff --git a/Makefile b/Makefile
index 9e38b2b..16049c3 100644
--- a/Makefile
+++ b/Makefile
@@ -128,14 +128,18 @@ Unregister :: \
 
 RegisterSettings ::
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS) > NUL
 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS32) > NUL
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS32) > NUL
 !ENDIF
 
 UnregisterSettings ::
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS) > NUL
 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS32) > NUL
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS32) > NUL
 !ENDIF
 
 InstallFonts :: \
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 2e36fe6..25edb1b 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -125,6 +125,8 @@ featZRCola	compwxExtend.mo.sl_SI
 featZRCola	compwxstd.mo.sl_SI
 featZRCola	compLocalizationRepositoryPath
 featZRCola	compLanguage
+featZRCola	compDatabasePath
+featZRCola	compZRCola.zrcdb
 featZRCola	comp00_ZRCola_Re.ttf
 <<NOKEEP
 
diff --git a/ZRCola/zrcolaapp.h b/ZRCola/zrcolaapp.h
index 7926702..8cfa260 100644
--- a/ZRCola/zrcolaapp.h
+++ b/ZRCola/zrcolaapp.h
@@ -46,6 +46,13 @@ public:
     /// - false otherwise
     virtual bool OnInit();
 
+
+    ///
+    /// \returns Path to ZRCola.zrcdb file
+    ///
+    inline wxString GetDatabasePath() const;
+
+
 protected:
     wxConfig m_config;  ///< Application configuration
     wxLocale m_locale;  ///< Current locale
@@ -53,3 +60,19 @@ protected:
 
 
 wxDECLARE_APP(ZRColaApp);
+
+
+inline wxString ZRColaApp::GetDatabasePath() const
+{
+    wxString sPath;
+    if (m_config.Read(wxT("DatabasePath"), &sPath)) {
+        if (!wxEndsWithPathSeparator(sPath))
+            sPath << wxFILE_SEP_PATH;
+    } else {
+        sPath = wxPathOnly(argv[0]);
+        sPath << wxT("\\..\\data\\");
+    }
+    sPath << wxT("ZRCola.zrcdb");
+
+    return sPath;
+}
diff --git a/ZRCola/zrcolacomppnl.cpp b/ZRCola/zrcolacomppnl.cpp
index 8982ad5..3dcd52c 100644
--- a/ZRCola/zrcolacomppnl.cpp
+++ b/ZRCola/zrcolacomppnl.cpp
@@ -30,10 +30,7 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
     m_selComposed(0, 0),
     wxZRColaComposerPanelBase(parent)
 {
-    wxString sPath(wxPathOnly(wxTheApp->argv[0]));
-    sPath << wxT("\\..\\data\\ZRCola.zrcdb"); // TODO: Make database file configurable
-
-    std::fstream dat((LPCTSTR)sPath, std::ios_base::in | std::ios_base::binary);
+    std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabasePath(), std::ios_base::in | std::ios_base::binary);
     if (dat.good()) {
         if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
             ZRCola::recordsize_t size;
diff --git a/ZRCola/zrcolakeyhndlr.cpp b/ZRCola/zrcolakeyhndlr.cpp
index 8c92a01..dcafb8c 100644
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -26,10 +26,7 @@
 
 wxZRColaKeyHandler::wxZRColaKeyHandler() : wxEvtHandler()
 {
-    wxString sPath(wxPathOnly(wxTheApp->argv[0]));
-    sPath << wxT("\\..\\data\\ZRCola.zrcdb"); // TODO: Make database file configurable
-
-    std::fstream dat((LPCTSTR)sPath, std::ios_base::in | std::ios_base::binary);
+    std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabasePath(), std::ios_base::in | std::ios_base::binary);
     if (dat.good()) {
         if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
             ZRCola::recordsize_t size;