diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 1a7b06f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-setuptool-1.19.9.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e62dfdd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+setuptool-1.19.10.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d6da125..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: setuptool
-# $Id: Makefile,v 1.2 2007/10/15 19:22:50 notting Exp $
-NAME := setuptool
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/setup.1 b/setup.1
new file mode 100644
index 0000000..e275540
--- /dev/null
+++ b/setup.1
@@ -0,0 +1,39 @@
+.\" Copyright (C) 2009 Red Hat, Inc. All rights reserved.
+.\" Man page author: Michal Hlavinka <mhlavink@redhat.com>
+.TH setup 1 2009-10-07 "Linux" "setuptool"
+.SH NAME
+setup \- A text mode system configuration tool
+.SH SYNOPSIS
+\fBsetup\fP
+.SH DESCRIPTION
+The setuptool program (\fBsetup\fP) is a front-end menu program for a group of other
+tools, mostly \fBsystem\-config\-*\-tui\fP tools. The list of options which it presents is assembled by scanning
+/etc/setuptool.d and /usr/share/setuptool/setuptool.d for files.
+
+Each file in the directory should contain one or more lines of text.  Each line
+contains from one to four fields which are separated by "|" characters.  In
+order, they are:
+  - the path to the binary to invoke (mandatory)
+  - the untranslated name of the application which should be displayed
+    (If unset, defaults to the path of the binary, but don't depend on that.)
+  - the gettext textdomain in which a translation of the name of the application can be found
+    (If unset, defaults to "setup".)
+  - the directory in which translations for the textdomain can be found
+    (If unset, defaults to "/usr/share/locale".)
+
+If multiple entries with the same untranslated name exist, the one which was
+read FIRST takes precedence. Files are read in name collation order.
+.SH EXAMPLE
+A contrived example would create /etc/setuptool.d/00bogus with these contents:
+
+.nf
+  /bin/ls --color; /bin/sleep 5|Example "ls" invocation.
+.fi
+
+or
+
+.nf
+  /bin/ls --color; /bin/sleep 5|Give this help list|libc
+.fi
+
+to use one of libc's (not meaningful here, but) translatable messages.
diff --git a/setuptool.spec b/setuptool.spec
index ae03f4b..92a6534 100644
--- a/setuptool.spec
+++ b/setuptool.spec
@@ -1,11 +1,13 @@
 Name: setuptool
-Version: 1.19.9
+Version: 1.19.10
 Release: 2%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
 Group: Applications/System
 Url: http://git.fedorahosted.org/git/?p=setuptool.git
 Source: setuptool-%{version}.tar.gz
+#for setuptool <= 1.19.10
+Source1: setup.1
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: newt-devel, gettext, perl-XML-Parser, glib2-devel, intltool
 Requires: usermode
@@ -25,6 +27,12 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+#for setuptool <= 1.19.10
+cp %{SOURCE1} .
+gzip setup.1
+install -D setup.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/setup.1.gz
+
 %find_lang setup
 
 %clean
@@ -41,8 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/setuptool.d
 %dir %{_sysconfdir}/setuptool.d
 %config(noreplace) %{_sysconfdir}/setuptool.d/*
+%{_mandir}/man1/setup.1.gz
 
 %changelog
+* Wed May 19 2010 Michal Hlavinka <mhlavink@redhat.com> 1.19.10-2
+- install man page
+
+* Wed Apr 07 2010 Michal Hlavinka <mhlavink@redhat.com> 1.19.10-1
+- update translations
+
 * Mon Nov 02 2009 Michal Hlavinka <mhlavink@redhat.com> 1.19.9-2
 - spec cleanup
 
diff --git a/sources b/sources
index 743d304..454294d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36546cdcaa56fd472172ca9bec9a6ddc  setuptool-1.19.9.tar.gz
+7dae48437eca3d713cee3985a5f80b8d  setuptool-1.19.10.tar.gz