diff --git a/.cvsignore b/.cvsignore
index e69de29..4e64149 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+kanatest-0.3.6.tar.gz
diff --git a/kanatest.desktop b/kanatest.desktop
new file mode 100644
index 0000000..f004500
--- /dev/null
+++ b/kanatest.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Hiragana and Katakana Test
+Name[es]=Prueba de Hiragana y Katakana
+Comment=Hiragana and Katakana drill tool
+Comment[es]=Herramienta de entrenamiento en Hiragana y Katakana
+Exec=kanatest
+Icon=kanatest.png
+Terminal=false
+Type=Application
+StartupNotify=true
diff --git a/kanatest.spec b/kanatest.spec
new file mode 100644
index 0000000..fc000c9
--- /dev/null
+++ b/kanatest.spec
@@ -0,0 +1,66 @@
+Name:           kanatest
+Version:        0.3.6
+Release:        3
+Summary:        Hiragana and Katakana drill tool
+
+Group:          Amusements/Games
+License:        GPL
+URL:            http://clay.ll.pl/kanatest.html
+Source0:        http://clay.ll.pl/download/%{name}-%{version}.tar.gz
+Source1:        kanatest.desktop
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils >= 0.9
+BuildRequires:  gtk2-devel >= 2.0
+
+%description
+Kanatest is a simple, GTK 2-based kana drill tool. It offers three drill modes:
+hiragana, katakana, and mixed mode. The tester shows random kana characters
+and waits until you enter the romaji equivalent in an entry field. At the end,
+statistics are provided.
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+desktop-file-install --vendor fedora               \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
+  --add-category X-Fedora                          \
+  --add-category Application                       \
+  --add-category Game                              \
+  %{SOURCE1}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README COPYING ChangeLog NEWS
+%{_bindir}/kanatest
+%{_mandir}/man1/kanatest.1*
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/kanatest
+%{_datadir}/pixmaps/kanatest.png
+
+
+%changelog
+* Fri May 20 2005 Robert Marcano <robert[AT]marcanoonline.com> - 0.3.6-3
+- Added desktop-file-utils to BuildRequires
+
+* Mon May 09 2005 Robert Marcano <robert[AT]marcanoonline.com> - 0.3.6-2
+- Fix spec file following fedora-extras-list recomendations
+
+* Sun May 08 2005 Robert Marcano <robert[AT]marcanoonline.com> - 0.3.6-1
+- Initial RPM release.
diff --git a/sources b/sources
index e69de29..5e73da7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cd1eb1ce62a52cf69f4df9041a886794  kanatest-0.3.6.tar.gz