diff --git a/Makefile b/Makefile
index b580259..f0f0f8e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 # https://github.com/mmstick/tv-renamer/blob/3f9e274e1b2300209172d4b3c991e9e7952b7259/Makefile
 
 DESTDIR = /usr
-version = $(shell awk 'NR == 3 {print substr($$3, 2, length($$3)-2)}' Cargo.toml)
 
 all:
 	cargo build --release
@@ -14,6 +13,15 @@ install:
 	install -Dm 644 README.md "${DESTDIR}/share/doc/hammond/README"
 	install -Dm 644 LICENSE "${DESTDIR}/share/licenses/hammond/COPYING"
 
+tar:
+	install -Dm 755 "target/release/hammond-gtk" "hammond/bin/hammond"
+	ln -sf "hammond/bin/hammond" "hammond/bin/hammond-gtk"
+	install -Dm 644 "assets/hammond.desktop" "hammond/share/applications/hammond.desktop"
+	install -Dm 644 README.md "hammond/share/doc/hammond/README"
+	install -Dm 644 LICENSE "hammond/share/licenses/hammond/COPYING"
+	tar cf - "hammond" | xz -zf > "hammond_$(shell uname -m).tar.xz"
+	rm -rf hammond
+
 uninstall:
 	rm "${DESTDIR}/bin/hammond"
 	rm "${DESTDIR}/bin/hammond-gtk"
diff --git a/README.md b/README.md
index 441b03a..64aebf6 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,7 @@ cargo run -p hammond-gtk --release
 ```sh
 git clone https://gitlab.gnome.org/alatiera/hammond.git
 cd Hammond/
-make
-sudo make install
+make && sudo make install
 ```
 
 **Additionall:**
@@ -68,14 +67,14 @@ $ tree -d
 ├── assets              # png's used in the README.md
 ├── hammond-data        # Storate related stuff, Sqlite db, XDG setup.
 │   ├── migrations      # Diesel migrations.
-│   │   └── ... 
+│   │   └── ...
 │   ├── src
 │   └── tests
 │       └── feeds       # Raw RSS Feeds used for tests.
 ├── hammond-downloader  # Really basic, Really crappy downloader.
 │   └── src
-├── hammond-gtk         # The Gtk+ Client                            
-│   ├── resources       # GResources folder                                                                                         
+├── hammond-gtk         # The Gtk+ Client
+│   ├── resources       # GResources folder
 │   │   └── gtk         # Contains the glade.ui files.
 │   └── src
 │       ├── views       # Currently only contains the Podcasts_view.
diff --git a/hammond-data/src/lib.rs b/hammond-data/src/lib.rs
index 8ae8d31..28d4047 100644
--- a/hammond-data/src/lib.rs
+++ b/hammond-data/src/lib.rs
@@ -39,7 +39,7 @@ embed_migrations!("migrations/");
 lazy_static!{
     #[allow(dead_code)]
     static ref HAMMOND_XDG: xdg::BaseDirectories = {
-        xdg::BaseDirectories::with_prefix("Hammond").unwrap()
+        xdg::BaseDirectories::with_prefix("hammond").unwrap()
     };
 
     static ref _HAMMOND_DATA: PathBuf = {