diff --git a/Makefile b/Makefile
index 35c4ffa..fda012c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for source rpm: fldigi
-# $Id: Makefile,v 1.1 2008/02/16 03:28:58 kevin Exp $
+# $Id: Makefile,v 1.2 2009/11/25 23:16:26 notting Exp $
 NAME := fldigi
 SPECFILE = $(firstword $(wildcard *.spec))
 
diff --git a/fldigi.spec b/fldigi.spec
index 54f83da..29b4f7b 100644
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,15 +1,12 @@
 Name:		fldigi
-Version:	3.12.5
+Version:	3.20.12
 Release:	1%{?dist}
 Summary:	Digital modem program for Linux
 Group:		Applications/Communications
 License:	GPLv2+	
-URL:		http://www.w1hkj.com/fldigi-distro/
-Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+URL:		http://www.w1hkj.com/Fldigi.html
+Source0:	http://www.w1hkj.com/downloads/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The package should be updated to current, patch re-diffed and send upstream!
-# Commented out 07-16-2009 patch applied upstream 3.11.6
-# Patch0:	%{name}-gcc44.patch
 
 BuildRequires:	hamlib-devel
 BuildRequires:	fltk-devel
@@ -21,7 +18,9 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	libsamplerate-devel
 BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	xmlrpc-c-devel
+BuildRequires:	gettext
 
+Requires:	hamilb
 
 %description
 fldigi is a modem program which supports most of the digital modes used by 
@@ -30,19 +29,16 @@ sound card to WWV or doing a frequency measurement test. The program also comes
 with a CW decoder. fldigi is written with the help of the Fast Light Toolkit X 
 GUI.
 
+flarq (Fast Light Automatic Repeat Request) is a file transfer application that is
+based on the ARQ specification developed by Paul Schmidt, K9PS.  It is
+capable of transmitting and receiving frames of ARQ data via fldigi.
+
+The fldigi-shell program controls fldigi over HTTP via XML-encoded
+remote procedure calls (XML-RPC). It can call any XML-RPC method
+exported by fldigi, and also defines some useful commands of its own.
+
 %prep
-%setup -q
-# %patch0
-# Remove executeable tags to quiet rpmlint
-chmod -x src/include/jalocha/pj_struc.h
-chmod -x src/include/jalocha/pj_fifo.h
-chmod -x src/include/jalocha/pj_cmpx.h
-chmod -x src/include/jalocha/pj_fft.h
-chmod -x src/include/jalocha/pj_gray.h
-chmod -x src/include/jalocha/pj_lowpass3.h
-chmod -x src/include/jalocha/pj_fht.h
-chmod -x src/olivia/olivia.cxx
-chmod -x src/include/jalocha/pj_mfsk.h
+%setup -q -n %{name}-%{version}
 
 %build
 %configure
@@ -57,6 +53,8 @@ desktop-file-install --vendor="" \
 $RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop
 # --vendor obsolete per new guidlines but leaving it in because
 # this is an existing package with vendor previously installed
+# fldigi-shell is cli no .desktop needed
+
 %find_lang %{name}
 
 %clean
@@ -66,28 +64,30 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/%{name}.xpm
 %{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/%{name}-shell.1.gz
+%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/flarq.xpm 
 %{_mandir}/man1/flarq.1.gz
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
-%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
-
+%{_mandir}/man1/%{name}-shell.1.gz
 
 %changelog
+* Sun May 23 2010 Randall J. Berry <dp67@fedoraproject.com> 3.20.12-1
+- Upstream update 3.20.12
+- Fix URLs
+- Many features added this version
+- See http://www.w1hkj.com/Fldigi.html for details
 * Thu Apr 22 2010 Randall J. Berry <dp67@fedoraproject.com> 3.12.5-1
 - Upstream upgrade to 3.12.5
 - Apply changes to spec to include pulseaudio as in bug 562515
 - Added Buildeps pulseaudio-libs-devel, xmlrpc-c-devel (bug 562515)
 - Added manpage generated by builddeps (bug 562515)
 - Corrected spelling in description (bug 562515)
-
 * Thu Apr 22 2010 Jon Ciesla <limb@jcomserv.net> - 3.11.6-3
 - Correction for X11 DSO linking FTBFS, BZ 565116.
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Thu Jul 16 2009 Randall J. Berry <dp67@fedoraproject.com> 3.11.6-1
 - Upstream upgrade to 3.11.6
 - Remove fldigi-gcc44.patch (applied upstream)
diff --git a/sources b/sources
index db9aa3e..fb492ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec8c8519bb64ed29496cd9f3f71a9d57  fldigi-3.12.5.tar.gz
+65f2bf4779a2086a7e822a2ab828cd44  fldigi-3.20.12.tar.gz