diff --git a/.gitignore b/.gitignore
index 8b3cd75..95081ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ yash-doc-2.23-ja.tar.gz
 /yash-doc-2.29-ja.tar.gz
 /yash-2.30.tar.gz
 /yash-doc-2.30-ja.tar.gz
+/yash-2.31.tar.gz
+/yash-doc-2.31-ja.tar.gz
diff --git a/sources b/sources
index e245053..bb332a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-12b57cfe1979ba32b5b925e351a9626f  yash-2.30.tar.gz
-6653c54f98de0bf0b913d04a837807e1  yash-doc-2.30-ja.tar.gz
+4771fc74695f1e3699584bb4a1d55e37  yash-2.31.tar.gz
+0c3aefd81407562c947d2d3cb2baf5bd  yash-doc-2.31-ja.tar.gz
diff --git a/yash.spec b/yash.spec
index f1b2c64..64a027e 100644
--- a/yash.spec
+++ b/yash.spec
@@ -2,9 +2,9 @@
 # Upstream is currently using SVN
 # SVN path: http://svn.sourceforge.jp/svnroot/yash/yash/trunk
 
-%global		repoid		54783
-%global		mainver	2.30
-%global		docver		2.30
+%global		repoid		56285
+%global		mainver	2.31
+%global		docver		2.31
 
 %global		mainrel		1
 %undefine		minorver
@@ -21,6 +21,9 @@ Source0:	http://dl.sourceforge.jp/yash/%{repoid}/%{name}-%{version}%{?minorver}.
 Source1:	http://dl.sourceforge.jp/yash/%{repoid}/%{name}-doc-%{docver}%{?minorver}-ja.tar.gz
 
 BuildRequires:	ncurses-devel
+%if 0%{?fedora} >= 17
+Provides:		/bin/yash
+%endif
 # Write needed Requires for scriptlets explicitly
 Requires(post):	grep
 Requires(post):	coreutils
@@ -65,7 +68,11 @@ env \
 	./configure \
 	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
+%if 0%{?fedora} >= 17
+	--bindir=%{_bindir} \
+%else
 	--bindir=/bin \
+%endif
 	--datarootdir=%{_datarootdir} \
 
 make -k %{?_smp_mflags}
@@ -73,7 +80,7 @@ make -k %{?_smp_mflags}
 %install
 make install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	INSTALL_PROGRAM="install -p" \
+	INSTALL="install -p" \
 	CPPROG="cp -p"
 
 %find_lang %{name}
@@ -104,7 +111,11 @@ exit 0
 %lang(ja)	%doc	NEWS.ja
 %lang(ja)	%doc	README.ja
 
+%if 0%{?fedora} >= 17
+%{_bindir}/%{name}
+%else
 /bin/%{name}
+%endif
 
 %dir	%{_datadir}/%{name}
 %{_datadir}/%{name}/completion/
@@ -114,6 +125,9 @@ exit 0
 %lang(ja)	%doc	%{name}-doc-%{docver}%{?minorver}/*
 
 %changelog
+* Mon Jun 25 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.31-1
+- 2.31
+
 * Mon Feb  6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.30-1
 - 2.30