diff --git a/Makefile.am b/Makefile.am
index 69186cb248..3ffdef10d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,6 +332,9 @@ docs:
 	@echo "error: doxygen not found"
 endif
 
+src_files: $(DISTFILES)
+	@true
+
 clean-docs:
 	rm -rf doc/doxygen
 
diff --git a/configure.ac b/configure.ac
index aab6d370a2..902d0b40f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -849,9 +849,6 @@ case $host in
 esac
 
 AM_CONDITIONAL([CAN_RENDER_ICONS], [test "$can_render_icons" = "yes"])
-if test "$can_render_icons" != "yes"; then
-  AC_MSG_WARN([Couldn't find ${can_render_icons}; you won't get the Knots-branded Bitcoin icon])
-fi
 
 if test "$use_extended_functional_tests" != "no"; then
   AC_SUBST(EXTENDED_FUNCTIONAL_TESTS, --extended)
diff --git a/contrib/guix/libexec/make_release_tarball.sh b/contrib/guix/libexec/make_release_tarball.sh
index 0c9c6ef3c3..74b7ffa9e6 100755
--- a/contrib/guix/libexec/make_release_tarball.sh
+++ b/contrib/guix/libexec/make_release_tarball.sh
@@ -24,6 +24,7 @@ cd "${DISTNAME}"
 
 ./autogen.sh
 ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
+make src_files
 make distclean
 
 cd ..
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e6ecf05a3..01038c4c7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1100,6 +1100,43 @@ endif
 	} > "$@.new" && mv -f "$@.new" "$@"
 	@echo "Generated $@"
 
+# Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball
+
+RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
+
+RES_RENDERED_ICONS = \
+  qt/res/rendered_icons/bitcoin.ico \
+  qt/res/rendered_icons/bitcoin1024.png
+
+RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
+  $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
+  qt/res/rendered_icons/bitcoin.icns \
+  qt/res/rendered_icons/nsis-wizard.bmp
+
+EXTRA_DIST += $(RES_RENDERED_ICON_SRC) $(RES_ALL_RENDERED_ICONS)
+
+if CAN_RENDER_ICONS
+
+qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
+	@$(MKDIR_P) $(@D)
+	$(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
+
+# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
+qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
+	$(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
+
+qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
+	$(PNG2ICNS) $@ $^
+
+qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16)
+	$(IMAGEMAGICK_CONVERT) $^ $@
+
+qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
+	$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
+
+endif
+
+
 if EMBEDDED_LEVELDB
 include Makefile.crc32c.include
 include Makefile.leveldb.include
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 3d8004e7f0..e035cd357b 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -172,17 +172,6 @@ BITCOIN_QT_H = \
 QT_RES_FONTS = \
   qt/res/fonts/RobotoMono-Bold.ttf
 
-RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
-
-RES_RENDERED_ICONS = \
-  qt/res/rendered_icons/bitcoin.ico \
-  qt/res/rendered_icons/bitcoin1024.png
-
-RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
-  $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
-  qt/res/rendered_icons/bitcoin.icns \
-  qt/res/rendered_icons/nsis-wizard.bmp
-
 QT_RES_ICONS = $(RES_RENDERED_ICONS) \
   qt/res/icons/add.png \
   qt/res/icons/address-book.png \
@@ -395,7 +384,7 @@ $(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(Q
 	@test -f $(RCC)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
 
-CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD) $(RES_ALL_RENDERED_ICONS)
+CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD)
 
 CLEANFILES += $(CLEAN_QT)
 
@@ -433,32 +422,3 @@ moc_%.cpp: %.h
 	@test -f $(LRELEASE)
 	@$(MKDIR_P) $(@D)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@
-
-EXTRA_DIST += $(RES_RENDERED_ICON_SRC)
-
-if CAN_RENDER_ICONS
-
-qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
-	@$(MKDIR_P) $(@D)
-	$(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
-
-# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
-qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
-	$(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
-
-qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
-	$(PNG2ICNS) $@ $^
-
-qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16)
-	$(IMAGEMAGICK_CONVERT) $^ $@
-
-qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
-	$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
-
-else
-
-qt/res/rendered_icons/%: qt/res/icons/%
-	@$(MKDIR_P) $(@D)
-	cp $< $@
-
-endif