diff --git a/.gitignore b/.gitignore
index a537f6e..7d7f225 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1 @@
-libedit-20110227-3.0.tar.gz
-/libedit-20110802-3.0.tar.gz
-/libedit-20120601-3.0.tar.gz
-/libedit-20121213-3.0.tar.gz
-/libedit-20130601-3.1.tar.gz
-/libedit-20130712-3.1.tar.gz
-/libedit-20140213-3.1.tar.gz
-/libedit-20141030-3.1.tar.gz
-/libedit-20150325-3.1.tar.gz
-/libedit-20160618-3.1.tar.gz
-/libedit-20170329-3.1.tar.gz
+/libedit-*.tar.gz
diff --git a/libedit.spec b/libedit.spec
index 796816f..3ed1684 100644
--- a/libedit.spec
+++ b/libedit.spec
@@ -1,14 +1,15 @@
-%global snap 20170329
-%global dir_snap 20170329
+%global snap 20181209
+%global dir_snap 20181209
 
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	3.1
-Release:	24.%{snap}cvs%{?dist}
+Release:	25.%{snap}cvs%{?dist}
 License:	BSD
 URL:		http://www.thrysoee.dk/editline/
 Source0:	http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 BuildRequires:	gcc
+BuildRequires:	groff-base
 BuildRequires:	ncurses-devel
 
 %description
@@ -28,23 +29,12 @@ This package contains development files for %{name}.
 %prep
 %setup -q -n %{name}-%{dir_snap}-%{version}
 
-# Suppress rpmlint error.
-iconv -f ISO8859-1 -t UTF-8 -o ChangeLog.utf-8 ChangeLog
-touch -r ChangeLog ChangeLog.utf-8
-mv -f ChangeLog.utf-8 ChangeLog
-
-# Replace an nroff macro that is not available, and not needed, on Linux
-sed -i 's,\\\*\[Gt\],>,' doc/editline.3.roff
+# Fix unused direct shared library dependencies.
+sed -i "s/lncurses/ltinfo/" configure
 
 %build
 %configure --disable-static --disable-silent-rules
 
-# Fix unused direct shared library dependencies.
-sed -i "s/lncurses/ltinfo/" src/Makefile
-
-# Downstream projects do not need to link with ncurses, just libedit.
-sed -i "s/ -lncurses//" libedit.pc
-
 make %{?_smp_mflags}
 
 %install
@@ -73,6 +63,13 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/history.3*
 %{_includedir}/editline/readline.h
 
 %changelog
+* Wed Jan 30 2019 Jerry James <loganjerry@gmail.com> - 3.1-25.20181209cvs
+- New version (20181209-3.1)
+- ChangeLog is now UTF-8, so drop conversion from ISO8859-1
+- Drop man page fix, fixed upstream
+- Drop pkgconfig file fix, fixed upstream
+- Add groff-base BR for man page generation
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-24.20170329cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 0a34ee6..805421b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libedit-20170329-3.1.tar.gz) = 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
+SHA512 (libedit-20181209-3.1.tar.gz) = 7673fb5612149a0d3508a103ac6f92041704911b27fffa084624f835fa6ac55b17c43b6e622ff9eac6ca06368e80ede14d93ec75afb5a368651734b8bfe045d2