diff --git a/.gitignore b/.gitignore
index b622873..a6f6e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /freerdp-0.8.2.tar.gz
 /FreeRDP-1.0.1.tar.gz
 /fastpath_send_input_pdu-sec_bytes.patch
+/freerdp-1.0.1.tar.gz
diff --git a/freerdp.spec b/freerdp.spec
index 6dd753a..aa5cea8 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -1,12 +1,12 @@
 Name:           freerdp
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Remote Desktop Protocol client
 
 Group:          Applications/Communications
 License:        ASL 2.0
 URL:            http://www.freerdp.com/
-Source0:        https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-%{version}.tar.gz
+Source0:        https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz
 # https://github.com/FreeRDP/FreeRDP/commit/165d39a290a109c0af16a1d223d1426cb524a844 backport
 Patch0:         fastpath_send_input_pdu-sec_bytes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +27,8 @@ BuildRequires:  pcsc-lite-devel
 BuildRequires:  desktop-file-utils
 
 Provides:       xfreerdp = %{version}-%{release}
-Requires:       %{name}-libs = %{version}-%{release}, %{name}-plugins = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-plugins%{?_isa} = %{version}-%{release}
 
 %description
 The xfreerdp Remote Desktop Protocol (RDP) client from the FreeRDP
@@ -52,7 +53,7 @@ libfreerdp-core can be extended with plugins handling RDP channels.
 %package        plugins
 Summary:        Plugins for handling the standard RDP channels
 Group:          Applications/Communications
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %description    plugins
 A set of plugins to the channel manager implementing the standard virtual
 channels extending RDP core functionality. For instance, sounds, clipboard
@@ -62,7 +63,7 @@ sync, disk/printer redirection, etc.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description    devel
@@ -71,7 +72,8 @@ developing applications that use %{name}-libs.
 
 
 %prep
-%setup -q -n FreeRDP-FreeRDP-8e62721
+
+%setup -q
 %patch0 -p1
 
 cat << EOF > xfreerdp.desktop 
@@ -162,6 +164,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Feb 29 2012 Mads Kiilerich <mads@kiilerich.com> - 1.0.1-5
+- Use new upstream tar with standard naming
+- Use _isa for subpackage dependencies
+
 * Tue Feb 28 2012 Mads Kiilerich <mads@kiilerich.com> - 1.0.1-4
 - Include patch for sending invalid extra data
 
diff --git a/sources b/sources
index b9741b5..889010f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1282189a87893bf196da20382e45f6c1  FreeRDP-1.0.1.tar.gz
+c843185e0ff22ce8409954651718f338  freerdp-1.0.1.tar.gz
 e4f49159bfb94ea534a8d14a2a5b5067  fastpath_send_input_pdu-sec_bytes.patch