diff --git a/.cvsignore b/.cvsignore
index ac70f66..8a7f00a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Mail-DKIM-0.36_6.tar.gz
+Mail-DKIM-0.37.tar.gz
diff --git a/perl-Mail-DKIM.spec b/perl-Mail-DKIM.spec
index 282f080..28dd042 100644
--- a/perl-Mail-DKIM.spec
+++ b/perl-Mail-DKIM.spec
@@ -1,14 +1,12 @@
 Name:           perl-Mail-DKIM
-Version:        0.36
-Release:        4%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://dkimproxy.sourceforge.net/
-# FIXME: Undo this when upstream returns to normal version numbers
-#Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
-Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}_6.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,8 +24,7 @@ It is required if you wish to enable DKIM checking in SpamAssassin via the
 Mail::SpamAssassin::Plugin::DKIM plugin.
 
 %prep
-# FIXME: Here too
-%setup -q -n Mail-DKIM-%{version}_6
+%setup -q -n Mail-DKIM-%{version}
 # Make the example scripts non-executable
 %{__chmod} -x scripts/*.pl
 
@@ -62,11 +59,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Sep 3 2009 Warren Togami <wtogami@redhat.com> - 0.36-4
-- 0.36_6
-
-* Wed Sep 2 2009 Warren Togami <wtogami@redhat.com> - 0.36-3
-- 0.36_5 ... why does upstream use strange version numbers?
+* Wed Sep 9 2009 Warren Togami <wtogami@redhat.com> - 0.37-1
+- 0.37
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index f34efc3..0a8844d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f9b20007dbfba239e9d037506ad8622  Mail-DKIM-0.36_6.tar.gz
+f3e84ec6b5e42d4cbcc7c42ea2900649  Mail-DKIM-0.37.tar.gz