diff --git a/dnscrypt.changes b/dnscrypt-proxy.changes
similarity index 100%
rename from dnscrypt.changes
rename to dnscrypt-proxy.changes
diff --git a/dnscrypt.service b/dnscrypt-proxy.service
similarity index 94%
rename from dnscrypt.service
rename to dnscrypt-proxy.service
index 1a97e61..72d32ca 100644
--- a/dnscrypt.service
+++ b/dnscrypt-proxy.service
@@ -1,4 +1,4 @@
-# This file is part of dnscrypt
+# This file is part of dnscrypt-proxy
 # Author: Marguerite Su <i@marguerite.su> with some AUR references.
 # Version: 1.4.0
 # Description: dnscrypt is a tool that encrypts your DNS queries in order to
@@ -26,3 +26,4 @@ Restart=on-abort
 
 [Install]
 WantedBy=multi-user.target
+Alias=dnscrypt.service
diff --git a/dnscrypt.spec b/dnscrypt-proxy.spec
similarity index 89%
rename from dnscrypt.spec
rename to dnscrypt-proxy.spec
index 95e4154..46dd8b5 100644
--- a/dnscrypt.spec
+++ b/dnscrypt-proxy.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package dnscrypt
+# spec file for package dnscrypt-proxy
 #
 # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -16,7 +16,7 @@
 #
 
 
-Name:           dnscrypt
+Name:           dnscrypt-proxy
 Version:        1.4.1
 Release:        0
 Summary:        A tool for securing communications between a client and a DNS resolver
@@ -24,7 +24,7 @@ License:        BSD-3-Clause
 Group:          Productivity/Networking/DNS/Utilities
 #Git-Url:       https://github.com/jedisct1/dnscrypt-proxy
 Url:            http://dnscrypt.org
-Source:         http://download.dnscrypt.org/dnscrypt-proxy/%{name}-proxy-%{version}.tar.bz2
+Source:         http://download.dnscrypt.org/dnscrypt-proxy/%{name}-%{version}.tar.bz2
 Source1:        %{name}.service
 BuildRequires:  libsodium-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -32,6 +32,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  systemd
 %{?systemd_requires}
 %endif
+Provides:	dnscrypt = %{version}-%{release}
+Obsoletes:	dnscrypt < %{version}-%{release}
 
 %description
 dnscrypt-proxy provides local service which can be used directly as your local resolver or as a DNS forwarder,
@@ -45,7 +47,7 @@ While not providing end-to-end security, it protects the local network, which is
 of the chain, against man-in-the-middle attacks. It also provides some confidentiality to DNS queries.
 
 %prep
-%setup -q -n %{name}-proxy-%{version}
+%setup -q
 
 %build
 %configure
@@ -77,11 +79,11 @@ cp -r %{SOURCE1} %{buildroot}%{_unitdir}
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README COPYING NEWS TECHNOTES THANKS
 %{_bindir}/hostip
-%{_sbindir}/%{name}-proxy
+%{_sbindir}/%{name}
 %{_unitdir}/%{name}.service
 %{_mandir}/man8/hostip.8.gz
-%{_mandir}/man8/%{name}-proxy.8.gz
-%dir %{_datadir}/%{name}-proxy
-%{_datadir}/%{name}-proxy/%{name}-resolvers.csv
+%{_mandir}/man8/%{name}.8.gz
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/dnscrypt-resolvers.csv
 
 %changelog