diff --git a/.cvsignore b/.cvsignore
index f3bed9a..8930f9a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fontpackages-1.22.tar.bz2
+fontpackages-1.23.tar.xz
diff --git a/fontpackages.spec b/fontpackages.spec
index a41608b..76c3c65 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -3,8 +3,8 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.22
-Release: 2%{?dist}
+Version: 1.23
+Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -12,7 +12,7 @@ Group:     Development/System
 # license of the packages they're inserted in
 License:   LGPLv3+
 URL:       http://fedoraproject.org/wiki/fontpackages/
-Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
+Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.xz
 
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -100,8 +100,13 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.22-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Sep 13 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.23-1
+— cleanups + add merging/remapping templates
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
+- 1.22-2
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sat Jun 20 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.22-1
diff --git a/import.log b/import.log
index 1245c8c..0044ef5 100644
--- a/import.log
+++ b/import.log
@@ -12,3 +12,4 @@ 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
 fontpackages-1_22-1_fc12:HEAD:fontpackages-1.22-1.fc12.src.rpm:1245574642
+fontpackages-1_23-1_fc12:HEAD:fontpackages-1.23-1.fc12.src.rpm:1252848946
diff --git a/sources b/sources
index 059ccbf..51d0b4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c010dccfc942b3b06859d324c299d2c  fontpackages-1.22.tar.bz2
+508caf81a8cffd7bbd3ee3208720d19b  fontpackages-1.23.tar.xz