diff --git a/SPECS/freefont/freefont.spec b/SPECS/freefont/freefont.spec
index 6da65a9e506..2aeae97e2ac 100644
--- a/SPECS/freefont/freefont.spec
+++ b/SPECS/freefont/freefont.spec
@@ -2,7 +2,7 @@
 Summary:        GNU Free fonts
 Name:           freefont
 Version:        20120503
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv3
 URL:            https://ftp.gnu.org/pub/gnu/freefont/
 Group:          System Environment/Base
@@ -10,7 +10,6 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        https://ftp.gnu.org/pub/gnu/%{name}/%{name}-ttf-%{version}.zip
 
-# BUG in Mariner RPMbuilder not providing zip
 BuildRequires: unzip
 
 %description
@@ -31,6 +30,10 @@ mv *.ttf %{buildroot}%{_fontdir}/
 %{_fontdir}/*.ttf
 
 %changelog
+* Tue Jun 20 2023 Osama Esmail <osamaesmail@microsoft.com> - 20120503-3
+- License verified
+- Removed irrelevant comment
+
 * Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 20120503-2
 - Added %%license line automatically
 
diff --git a/SPECS/graphviz/graphviz.spec b/SPECS/graphviz/graphviz.spec
index c7f2dd5a631..0af2d36d8cd 100644
--- a/SPECS/graphviz/graphviz.spec
+++ b/SPECS/graphviz/graphviz.spec
@@ -45,7 +45,7 @@
 Summary:        Graph Visualization Tools
 Name:           graphviz
 Version:        2.42.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL-1.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -77,6 +77,7 @@ BuildRequires:  pango-devel
 BuildRequires:  perl
 # Temporary workaound for perl(Carp) not pulled
 BuildRequires:  perl-Carp
+BuildRequires:  perl-ExtUtils-Embed
 BuildRequires:  perl-devel
 BuildRequires:  pkg-config
 BuildRequires:  python3-devel
@@ -147,6 +148,7 @@ Provides some additional PDF and HTML documentation for graphviz.
 %package gd
 Summary:        Graphviz plugin for renderers based on gd
 Requires:       %{name} = %{version}-%{release}
+Requires:       freefont
 Requires(post): %{_bindir}/dot
 Requires(post): /sbin/ldconfig
 Requires(postun): %{_bindir}/dot
@@ -266,7 +268,8 @@ sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linu
 %configure --with-x --disable-static --disable-dependency-tracking \
 	--without-mylibgd --with-ipsepcola --with-pangocairo \
 	--without-gdk-pixbuf --with-visio --disable-silent-rules \
-  --without-ruby --without-python2 \
+    --without-ruby --without-python2 \
+    --with-freetypeincludedir=%{_includedir}/freetype2 --with-freetypelibdir=%{_libdir}/lib \
 %if ! %{LASI}
 	--without-lasi \
 %endif
@@ -515,6 +518,11 @@ php --no-php-ini \
 %{_mandir}/man3/*.3tcl*
 
 %changelog
+* Thu Jun 22 2023 Osama Esmail <osamaesmail@microsoft.com> - 2.42.4-8
+- Trying some more `freefont` fixes (added Requires to gd)
+- Added freetype option to build
+- `dot` complains about not having URW1 fonts, but works anyway
+
 * Wed Mar 08 2023 Osama Esmail <osamaesmail@microsoft.com> - 2.42.4-7
 - Add `freefont` to BuildRequires to provide default font for graphviz