diff --git a/.gitignore b/.gitignore
index 79e2a38..74290ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ settings.json
 *.tar.gz
 *~
 .*~
-.bak
-.new
-.old
-.orig
+*.bak
+*.new
+*.old
+*.orig
diff --git a/Makefile b/Makefile
index 0fcffbb..f4e1413 100644
--- a/Makefile
+++ b/Makefile
@@ -9,18 +9,22 @@ info:
 # build a new debian package and create a link in the current directory
 .PHONY: deb
 deb: distclean
-	DEB_BUILD_OPTIONS=nocheck python3 setup.py \
-	--command-packages=stdeb.command \
-	sdist_dsc --compat 12 --package3 nanovnasaver --section electronics bdist_deb
-	-rm nanovnasaver_*.deb
-	-ln `ls deb_dist/nanovnasaver_*.deb | tail -1` .
+	@# build the deb package
+	PYBUILD_DISABLE=test python3 setup.py \
+	  --command-packages=stdeb.command \
+	  sdist_dsc --compat 10 --package3 nanovnasaver --section electronics \
+	  bdist_deb
+	@# create a link in the main directory
+	-@ln `ls deb_dist/nanovnasaver_*.deb | tail -1` .
+	@# and show the result
+	@ls -l nanovnasaver_*.deb
 
 
 # remove all package build artifacts (keep the *.deb)
 .PHONY: clean
 clean:
 	python setup.py clean
-	-rm -rf deb_dist dist *.tar.gz *.egg*
+	-rm -rf build deb_dist dist *.tar.gz *.egg*
 
 
 # remove all package build artefacts
diff --git a/NanoVNASaver.desktop b/NanoVNASaver.desktop
new file mode 100755
index 0000000..085d35a
--- /dev/null
+++ b/NanoVNASaver.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Categories=Electronics
+Comment[de_DE]=Programm das Daten vom NanoVNA liest, anzeigt und speichert
+Comment=Tool for reading, displaying and saving data from the NanoVNA
+Encoding=UTF-8
+Exec=NanoVNASaver
+GenericName[de_DE]=
+GenericName=
+Icon=NanoVNASaver_48x48.png
+MimeType=
+Name[de_DE]=NanoVNASaver
+Name=NanoVNASaver
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/NanoVNASaver_48x48.png b/NanoVNASaver_48x48.png
new file mode 120000
index 0000000..a1bb92e
--- /dev/null
+++ b/NanoVNASaver_48x48.png
@@ -0,0 +1 @@
+icon_48x48.png
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 75f50e2..7e70413 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,27 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 from setuptools import setup
 
-setup()
+
+data_files=[
+    ( "share/doc/nanovnasaver/", [ "CHANGELOG.md", "LICENSE", "README.md" ] ),
+    ( "share/applications/", [ "NanoVNASaver.desktop" ] ),
+    ( "share/icons/hicolor/48x48/apps/", [ "NanoVNASaver_48x48.png" ] ),
+]
+
+
+setup(
+author="NanoVNA-Saver organization",
+author_email="NanoVNA-Saver@users.noreply.github.com",
+url="https://github.com/NanoVNA-Saver/nanovna-saver",
+description="GUI for the NanoVNA and derivates",
+long_description="""A multiplatform tool to save Touchstone files from the NanoVNA,
+sweep frequency spans in segments to gain more data points,
+and generally display and analyze the resulting data.
+""",
+license="GPLv3",
+platforms=[ "all" ],
+data_files=data_files,
+)