diff --git a/.gitignore b/.gitignore
index cfcc409..5f6b67f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /Overpass_TTF_Fonts.zip
 /overpass-fonts-ttf-2.zip
 /overpass-fonts-ttf-2.1.zip
+/Overpass-Desktop-Fonts.zip
+/3.0.tar.gz
diff --git a/overpass-fonts.spec b/overpass-fonts.spec
index 972c5d8..0e7fa98 100644
--- a/overpass-fonts.spec
+++ b/overpass-fonts.spec
@@ -1,17 +1,18 @@
 %global fontname overpass
-%global archivename %{fontname}-fonts-ttf
 %global fontconf 60-%{fontname}.conf
+%global monofontconf 60-%{fontname}-mono.conf
 
 Name:		%{fontname}-fonts
-Version:	2.1
-Release:	2%{?dist}
+Version:	3.0
+Release:	1%{?dist}
 Summary:	Typeface based on the U.S. interstate highway road signage type system
-License:	OFL
+License:	OFL or LGPLv2+
 URL:		https://github.com/RedHatBrand/overpass/
-#Source0:	https://github.com/RedHatBrand/overpass/releases/download/2.0/overpass-fonts-ttf-2.zip
-Source0:	https://pravins.fedorapeople.org/overpass-fonts/%{archivename}-%{version}.zip
+Source0:	https://github.com/RedHatBrand/Overpass/archive/%{version}.tar.gz
 Source1:	%{name}-fontconfig.conf
 Source2:	%{fontname}.metainfo.xml
+Source3:	%{fontname}-mono-fonts-fontconfig.conf
+Source4:	%{fontname}-mono.metainfo.xml
 
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel
@@ -21,16 +22,28 @@ Requires:	fontpackages-filesystem
 Free and open source typeface based on the U.S. interstate highway road signage
 type system; it is sans-serif and suitable for both body and titling text.
 
+%package -n %{fontname}-mono-fonts
+Summary:	Monospace version of overpass fonts
+
+%description -n %{fontname}-mono-fonts
+Free and open source typeface based on the U.S. interstate highway road signage
+type system. This is the monospace family variant.
+
 %prep
-%setup -c -q
+%setup -q -n Overpass-%{version}
 
 %build
 # Nothing to do here.
 
 %install
-mv %{archivename}-%{version}/Overpass\ Specimen\ 8-20-15.pdf %{archivename}-%{version}/Overpass-Specimen-8-20-15.pdf
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p %{archivename}-%{version}/*.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p Desktop*Fonts/Overpass*TTF/*.ttf %{buildroot}%{_fontdir}
+
+# Andy, please, stawp!
+for i in %{buildroot}%{_fontdir}/*.ttf; do
+	realname=`echo $i |sed "s| |-|g"`
+	mv "$i" $realname
+done
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 		%{buildroot}%{_fontconfig_confdir}
@@ -38,19 +51,37 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 install -m 0644 -p %{SOURCE1} \
 		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}
 
+install -m 0644 -p %{SOURCE3} \
+		%{buildroot}%{_fontconfig_templatedir}/%{monofontconf}
+
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
 		%{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
+ln -s %{_fontconfig_templatedir}/%{monofontconf} \
+                %{buildroot}%{_fontconfig_confdir}/%{monofontconf}
+
 # Add AppStream metadata
 install -Dm 0644 -p %{SOURCE2} \
 	%{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
 
-%_font_pkg -f %{fontconf} *.ttf
-%doc %{archivename}-%{version}/README.md %{archivename}-%{version}/Overpass-Specimen-8-20-15.pdf
-%license %{archivename}-%{version}/LICENSE.md
+install -Dm 0644 -p %{SOURCE4} \
+        %{buildroot}%{_datadir}/appdata/%{fontname}-mono.metainfo.xml
+
+%_font_pkg -f %{fontconf} Overpass-Bold*.ttf Overpass-Extra*.ttf Overpass-Heavy*.ttf Overpass-Italic*.ttf Overpass-Light*.ttf Overpass-Regular*.ttf Overpass-SemiBold*.ttf Overpass-Thin*.ttf
+%doc README.md overpass_v3_specimen.pdf
+%license LICENSE.md
 %{_datadir}/appdata/%{fontname}.metainfo.xml
 
+%_font_pkg -n overpass-mono -f %{monofontconf} Overpass-Mono-*.ttf
+%doc README.md overpass_mono_v1_specimen.pdf
+%license LICENSE.md
+%{_datadir}/appdata/%{fontname}-mono.metainfo.xml
+
 %changelog
+* Wed Nov 16 2016 Tom Callaway <spot@fedoraproject.org> - 3.0-1
+- update to 3.0
+- add mono subpackage
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/overpass-mono-fonts-fontconfig.conf b/overpass-mono-fonts-fontconfig.conf
new file mode 100644
index 0000000..c973b33
--- /dev/null
+++ b/overpass-mono-fonts-fontconfig.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <alias>
+    <family>Overpass Mono</family>
+    <prefer>
+      <family>monospace</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <default>
+      <family>Overpass Mono</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/overpass-mono.metainfo.xml b/overpass-mono.metainfo.xml
new file mode 100644
index 0000000..08ce9ae
--- /dev/null
+++ b/overpass-mono.metainfo.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
+<component type="font">
+  <id>overpass-mono</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <name>Overpass Mono</name>
+  <summary>Monospace typeface based on the U.S. interstate highway road signage type system</summary>
+  <description>
+    <p>
+      Free and open source typeface based on the U.S. interstate highway road signage
+      type system; this is the monospace family variant.
+    </p>
+  </description>
+  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
+  <url type="homepage">https://fedorahosted.org/overpass-fonts/</url>
+</component>
+
diff --git a/sources b/sources
index 1d63735..4fd5499 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f60773a58fa25ae970a264909a3a6c36  overpass-fonts-ttf-2.1.zip
+17677099f5b90ea894fed37f1167f8dc  3.0.tar.gz