diff --git a/.gitignore b/.gitignore
index e69de29..8f38348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+Comfortaa___font_by_aajohan.zip
diff --git a/aajohan-comfortaa-fonts-fontconfig.conf b/aajohan-comfortaa-fonts-fontconfig.conf
new file mode 100644
index 0000000..9f324cc
--- /dev/null
+++ b/aajohan-comfortaa-fonts-fontconfig.conf
@@ -0,0 +1,17 @@
+<?xml version ="1.0" encoding="UTF-8" ?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <alias>
+   <family>sans-serif</family>
+     <prefer>
+	<family>Comfortaa</family>
+     </prefer>
+ </alias>
+ <alias>
+   <family>Comfortaa</family>
+   <default>
+	<family>sans-serif</family>
+   </default>
+ </alias>
+</fontconfig>
+		
diff --git a/aajohan-comfortaa-fonts.spec b/aajohan-comfortaa-fonts.spec
new file mode 100644
index 0000000..ae30159
--- /dev/null
+++ b/aajohan-comfortaa-fonts.spec
@@ -0,0 +1,75 @@
+%global fontname aajohan-comfortaa
+%global fontconf 61-%{fontname}.conf
+
+Name:           %{fontname}-fonts
+Version:        1.003
+Release:        4%{?dist}
+Summary:        Modern style true type font
+
+Group:          User Interface/X
+License:        OFL
+URL:            http://aajohan.deviantart.com
+Source0:        http://www.deviantart.com/download/105395949/Comfortaa___font_by_aajohan.zip
+Source1:        %{name}-fontconfig.conf
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+Requires:       fontpackages-filesystem
+
+%description
+Comfortaa is a sans-serif font comfortable in every aspect with
+Regular, Light Condensed, Italic, Bold Expanded, and Bold Italic variants.
+It has very good European language coverage and decent Cyrillic coverage.  
+
+%prep
+%setup -q -n Comfortaa
+
+# Fixing
+# wrong-file-end-of-line-encoding issue
+# Thanks to Paul Flo Williams
+
+for file in *.txt; do
+ sed 's/\r//g' "$file" | \
+ fold -s > "$file.new" && \
+ touch -r "$file" "$file.new" && \
+ mv "$file.new" "$file"
+done
+
+%build
+
+%install
+rm -rf %{buildroot}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
+%clean
+rm -rf %{buildroot}
+
+%_font_pkg -f %{fontconf} *.ttf
+
+%doc Please\ read\ me.txt Comfortaa\ FONTLOG.txt OFL\ -\ Font\ License.txt
+
+
+%changelog
+* Tue Aug 3 2010 Luya Tshimbalanga <luya@fedoraproject.org> - 1.003-4
+- Set the right close tag inside 61 conf file
+
+* Fri Jul 30 2010 Luya Tshimbalanga <luya@fedoraproject.org> - 1.003-3
+- Added missing documentations
+- Switched to the right versioning
+- Addressed wrong-file-end-of-line-encoding issue
+
+* Thu Jul 29 2010 Luya Tshimbalanga <luya@fedoraproject.org> - 1.003-2
+- Set prefix to 61 for fontconfig.conf
+- Shortened description
+- Some fixes
+
+* Tue Jul 27 2010 Luya Tshimbalanga <luya@fedoraproject.org> - 1.003-1
+- Initial RPM release.
diff --git a/sources b/sources
index e69de29..3315593 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+82ea5844d3126c3f56bf4466b2eca296  Comfortaa___font_by_aajohan.zip