diff --git a/.cvsignore b/.cvsignore
index 54ff614..a2cbafb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fontpackages-1.20.tar.bz2
+fontpackages-1.21.tar.bz2
diff --git a/fontpackages.spec b/fontpackages.spec
index 686fcbe..663c17c 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -3,8 +3,8 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.20
-Release: 2%{?dist}
+Version: 1.21
+Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -86,8 +86,6 @@ rm -fr %{buildroot}
 %files filesystem -f %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
-
-
 %files devel
 %defattr(0644,root,root,0755)
 %doc license.txt readme.txt
@@ -99,8 +97,14 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Jun 2 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.21-1
+— try to handle more corner naming cases in lua macro – expect some fallout
+  if your spec uses weird naming
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
+- 1.20-2
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 18 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.20-1
diff --git a/import.log b/import.log
index 2326ce4..34b97a4 100644
--- a/import.log
+++ b/import.log
@@ -10,3 +10,4 @@ fontpackages-1_19-1_fc11:HEAD:fontpackages-1.19-1.fc11.src.rpm:1234809006
 fontpackages-1_19-2_fc11:HEAD:fontpackages-1.19-2.fc11.src.rpm:1234813732
 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1234998636
 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1235377920
+fontpackages-1_21-1_fc12:HEAD:fontpackages-1.21-1.fc12.src.rpm:1243980659
diff --git a/sources b/sources
index 0529b2c..8db977c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b836f00bcf709f42295f624bbf4f19c7  fontpackages-1.20.tar.bz2
+f4a23a889cdf30b9bdb2eba74c86e6bc  fontpackages-1.21.tar.bz2