diff --git a/alpine-2.21-useragent.patch b/alpine-2.21-useragent.patch
new file mode 100644
index 0000000..83c1da2
--- /dev/null
+++ b/alpine-2.21-useragent.patch
@@ -0,0 +1,55 @@
+diff --git a/doc/tech-notes/config.html b/doc/tech-notes/config.html
+index b935483..751429c 100644
+--- a/doc/tech-notes/config.html
++++ b/doc/tech-notes/config.html
+@@ -7695,7 +7695,7 @@ If you'd like to suppress the echoing of the asterisks set this feature.
+ 
+ <DT> <A NAME="suppress-user-agent-when-sending"><EM>suppress-user-agent-when-sending</EM></A>
+ <DD> If this feature is set then <EM>Alpine</EM> will not generate a
+-<CODE>User-Agent</CODE> header in outgoing messages.
++<CODE>User-Agent</CODE> header in outgoing messages. It is set by default.
+ <P>
+ 
+ <DT> <A NAME="tab-checks-recent"><EM>tab-checks-recent</EM></A>
+diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
+index 2762c5b..b2d8cdd 100644
+--- a/doc/tech-notes/tech-notes.txt
++++ b/doc/tech-notes/tech-notes.txt
+@@ -6629,7 +6629,7 @@ John: on a job well done!
+           the echoing of the asterisks set this feature.
+    _suppress-user-agent-when-sending_
+           If this feature is set then _Alpine_ will not generate a
+-          User-Agent header in outgoing messages.
++          User-Agent header in outgoing messages.  It is set by default.
+    _tab-checks-recent_
+           In a FOLDER LIST screen, the TAB key usually just changes which
+           folder is highlighted. If this feature is set, then the TAB key
+diff --git a/pith/conf.c b/pith/conf.c
+index cea59de..529c063 100644
+--- a/pith/conf.c
++++ b/pith/conf.c
+@@ -3251,7 +3251,7 @@ feature_list(int index)
+ 	{"quell-timezone-comment-when-sending", "Suppress Timezone Comment When Sending",
+ 	 F_QUELL_TIMEZONE, h_config_quell_tz_comment, PREF_MISC, 0},
+ 	{"suppress-user-agent-when-sending", NULL,
+-	 F_QUELL_USERAGENT, h_config_suppress_user_agent, PREF_MISC, 0},
++	 F_QUELL_USERAGENT, h_config_suppress_user_agent, PREF_MISC, 1},
+ 	{"tab-checks-recent", "Tab Checks for Recent Messages",
+ 	 F_TAB_CHK_RECENT, h_config_tab_checks_recent, PREF_MISC, 0},
+ 	{"termdef-takes-precedence", NULL,
+diff --git a/pith/pine.hlp b/pith/pine.hlp
+index 1da108f..3ca4ca8 100644
+--- a/pith/pine.hlp
++++ b/pith/pine.hlp
+@@ -34823,7 +34823,7 @@ emit a beep to become silent.
+ <H1>FEATURE: <!--#echo var="FEAT_suppress-user-agent-when-sending"--></H1>
+ 
+ If this feature is set then Alpine will not generate a
+-<CODE>User-Agent</CODE> header in outgoing messages.
++<CODE>User-Agent</CODE> header in outgoing messages. It is set by default.
+ <P>
+ <UL>   
+ <LI><A HREF="h_finding_help">Finding more information and requesting help</A>
+-- 
+2.20.1
+
diff --git a/alpine.spec b/alpine.spec
index ea6ab93..d106dd2 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -6,13 +6,15 @@
 Summary: powerful, easy to use console email client
 Name: alpine
 Version: 2.21
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: ASL 2.0
 URL:     http://alpine.x10host.com/
 Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz
 Source1: README.fedora
 
+Patch1: alpine-2.21-useragent.patch
+
 # Using "Conflicts" instead of Obsoletes because while alpine is substantially
 # compatible with pine the change to Unicode breaks important user
 # functionality such as non-ASCII encoded saved passwords. Additionally, there
@@ -68,6 +70,7 @@ GNU Build System's autotools.
 
 %prep
 %setup -q -n alpine-%{version}
+%patch1 -p1
 
 install -m644 -p %{SOURCE1} .
 
@@ -118,6 +121,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed
 
 
 %changelog
+* Sun Jul 21 2019 Paul Wouters <pwouters@redhat.com> - 2.21-10
+- Patch to suppress sending the user-agent per default
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild