diff --git a/.cvsignore b/.cvsignore
index c6a5707..93357c8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-abcde_2.3.4.orig.tar.gz
+abcde_2.3.99.orig.tar.gz
diff --git a/abcde-2.3.99-conf.patch b/abcde-2.3.99-conf.patch
new file mode 100644
index 0000000..c41d679
--- /dev/null
+++ b/abcde-2.3.99-conf.patch
@@ -0,0 +1,60 @@
+--- abcde.conf~	2005-12-10 13:38:05.000000000 +0200
++++ abcde.conf	2005-12-10 13:44:45.000000000 +0200
+@@ -40,12 +40,12 @@
+ # so they can be reused when ripping CDs.
+ #CDDBUSELOCAL="n"
+ 
+-# List, separated with a coma, the fields we want the parsing function to
++# List, separated with a comma, the fields we want the parsing function to
+ # output. Defaults to YEAR and GENRE, for a complete list of fields provided by
+ # CDDB.
+ # The fields are not case sensitive. Actually, "y,g" will work as fine as "Y,G"
+ # or "YEAR, GENRE"
+-#SHOWPARSEDFIELDS=year,genre
++#SHOWCDDBFIELDS=year,genre
+ 
+ # Specify the style of encoder to use here - 
+ # oggenc, vorbize - for OGGENCODERSYNTAX
+@@ -271,7 +271,7 @@
+ # * Translate spaces and forward slashes to underscores
+ # * Translate stars into pluses.
+ # To change that, redefine the mungefilename function.
+-# mungefilename recieves the CDDB data (artist, track, title, whatever)
++# mungefilename receives the CDDB data (artist, track, title, whatever)
+ # as $1 and outputs it on stdout.
+ #mungefilename ()
+ #{
+@@ -280,7 +280,7 @@
+ 
+ # Custom genre munging:
+ # By default we just transform uppercase to lowercase. Not much of a fancy
+-# function, with not much use, but one can disable it ot just turn the first
++# function, with not much use, but one can disable it or just turn the first
+ # Uppercase.
+ #mungegenre ()
+ #{
+@@ -290,7 +290,7 @@
+ 
+ # Custom pre-read function
+ # By default it does nothing.
+-# You can set some things to get abcde funtion in better ways:
++# You can set some things to get abcde function in better ways:
+ # * Close the CD tray using eject -t (if available in eject and supported by 
+ #   your CD device.
+ # * Set the CD speed. You can also use the built-in options, but you can also 
+@@ -305,7 +305,7 @@
+ 
+ # Custom post-read function
+ # By default it does nothing.
+-# You can set some things to get abcde funtion in better ways:
++# You can set some things to get abcde function in better ways:
+ # * Store a copy of the CD TOC.
+ # KEEP IN MIND that executables included in post_read must be in your $PATH or
+ # you have to define them with full /path/to/binary
+@@ -325,5 +325,5 @@
+ #REMOTEHOSTS=foo,bar,baz,quux,qiix
+ 
+ # Set to obtain some information about actions happening in the background
+-# Usefull if you have a slow network or CDDB servers seem irresponsive.
++# Useful if you have a slow network or CDDB servers seem irresponsive.
+ #EXTRAVERBOSE=n
diff --git a/abcde.spec b/abcde.spec
index 6849c9e..028f473 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.4
+Version:        2.3.99
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -7,7 +7,8 @@ Group:          Applications/Multimedia
 License:        GPL or Artistic
 URL:            http://www.hispalinux.es/~data/abcde.php
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
-Patch0:         abcde-2.1.19-inst.patch
+Patch0:         %{name}-2.1.19-inst.patch
+Patch1:         %{name}-2.3.99-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,8 +28,8 @@ tags them, all in one go.
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 sed -i 's/normalize-audio/normalize/g' abcde*
-iconv -f iso-8859-1 -t utf-8 abcde.1 > abcde.1.utf8 ; mv abcde.1.utf8 abcde.1
 
 
 %install
@@ -44,7 +45,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc changelog COPYING README TODO FAQ examples/
+%doc COPYING FAQ README TODO USEPIPES changelog examples/
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
 %{_bindir}/cddb-tool
@@ -53,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99-1
+- 2.3.99, minor config file fixes.
+
 * Mon Sep  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.3.4-1
 - 2.3.4.
 
diff --git a/sources b/sources
index 72bd4ef..6989265 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz
+1310c7d2319dbee4baa27e8deeedc776  abcde_2.3.99.orig.tar.gz