diff --git a/fontconfig.changes b/fontconfig.changes
index dcb8b98..8c97873 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  2 15:09:56 UTC 2012 - pgajdos@suse.com
+
+- Arimo is sans-serif and Tinos is serif, not the opposite
+
 -------------------------------------------------------------------
 Fri Jul 27 09:52:20 UTC 2012 - pgajdos@suse.com
 
diff --git a/metric-croscore.patch b/metric-croscore.patch
index 84405ba..3d379eb 100644
--- a/metric-croscore.patch
+++ b/metric-croscore.patch
@@ -7,8 +7,8 @@ Index: conf.d/30-metric-aliases.conf
  			Liberation Serif
  			Liberation Mono
 +		Croscore fonts;
-+			Tinos
 +			Arimo
++			Tinos
 +			Cousine
  		StarOffice fonts:
  			Albany
@@ -17,7 +17,7 @@ Index: conf.d/30-metric-aliases.conf
  	</alias>
  
  	<alias binding="same">
-+	  <family>Tinos</family>
++	  <family>Arimo</family>
 +	  <default>
 +	  <family>Arial</family>
 +	  </default>
@@ -31,7 +31,7 @@ Index: conf.d/30-metric-aliases.conf
  	</alias>
  
  	<alias binding="same">
-+	  <family>Arimo</family>
++	  <family>Tinos</family>
 +	  <default>
 +	  <family>Times New Roman</family>
 +	  </default>
@@ -59,7 +59,7 @@ Index: conf.d/30-metric-aliases.conf
  	<alias binding="same">
  	  <family>Arial</family>
  	  <accept>
-+	  <family>Tinos</family>
++	  <family>Arimo</family>
  	  <family>Liberation Sans</family>
  	  <family>Albany</family>
  	  <family>Albany AMT</family>
@@ -67,7 +67,7 @@ Index: conf.d/30-metric-aliases.conf
  	<alias binding="same">
  	  <family>Times New Roman</family>
  	  <accept>
-+	  <family>Arimo</family>
++	  <family>Tinos</family>
  	  <family>Liberation Serif</family>
  	  <family>Thorndale</family>
  	  <family>Thorndale AMT</family>
diff --git a/suse-generic-names.conf b/suse-generic-names.conf
index 937244a..1dc3a5a 100644
--- a/suse-generic-names.conf
+++ b/suse-generic-names.conf
@@ -31,7 +31,7 @@
 		<family>IPAexMincho</family>
 		<family>Sazanami Mincho</family>
 		<family>STIXGeneral</family>
-		<family>Arimo</family>
+		<family>Tinos</family>
 		<default><family>serif</family></default>
 	</alias>
 <!--
@@ -61,7 +61,7 @@
 		<family>IPAexGothic</family>
 		<family>Sazanami Gothic</family>
 		<family>Baekmuk Gulim</family>
-		<family>Tinos</family>
+		<family>Arimo</family>
 		<default><family>sans-serif</family></default>
 	</alias>
 <!--
diff --git a/suse-post-user.conf b/suse-post-user.conf
index bc641a0..ac7b376 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -14,7 +14,7 @@
 			<family>Thorndale AMT</family>
 			<family>DejaVu Serif</family>
 			<family>Droid Serif</family>
-			<family>Arimo</family>
+			<family>Tinos</family>
 			<family>Liberation Serif</family>
 			<family>SUSE Serif</family>
 			<family>Bitstream Vera Serif</family>
@@ -67,7 +67,7 @@
 			<family>Verdana</family>
 			<family>DejaVu Sans</family>
 			<family>Droid Sans</family>
-			<family>Tinos</family>
+			<family>Arimo</family>
 			<family>Liberation Sans</family>
 			<family>Cantarell</family>
 			<family>SUSE Sans</family>