diff --git a/install.bat b/install.bat
index d8e8c69..c9f2b09 100755
--- a/install.bat
+++ b/install.bat
@@ -71,7 +71,7 @@ rem copy cygpopt-0.dll "%installdir%"\bin
 rem copy cygiconv-2.dll "%installdir%"\bin
 rem copy cygintl-8.dll "%installdir%"\bin
 
-rem create system config directory and copy config archive
+rem create system config directory and copy config archive and scripts
 mkdir "%installdir%\usr\share\mintty\lang" 2> nul:
 copy lang.zoo "%installdir%\usr\share\mintty\lang"
 mkdir "%installdir%\usr\share\mintty\themes" 2> nul:
@@ -83,6 +83,9 @@ copy charnames.txt "%installdir%\usr\share\mintty\info"
 mkdir "%installdir%\usr\share\mintty\icon" 2> nul:
 copy tux.ico "%installdir%\usr\share\mintty\icon"
 copy mintty.ico "%installdir%\usr\share\mintty\icon"
+mkdir "%installdir%\usr\share\mintty\emojis" 2> nul:
+copy getemojis "%installdir%\usr\share\mintty\emojis" 2> nul:
+copy getflags "%installdir%\usr\share\mintty\emojis" 2> nul:
 
 
 rem create Start Menu Folder
@@ -131,10 +134,13 @@ rmdir "%oldroot%\home" 2> nul:
 
 :userconfig
 
-rem create user config directory and subfolders
+rem create user config directory and subfolders, copy scripts
 mkdir "%configdir%\lang" 2> nul:
 mkdir "%configdir%\themes" 2> nul:
 mkdir "%configdir%\sounds" 2> nul:
+mkdir "%configdir%\emojis" 2> nul:
+copy "%installdir%\usr\share\mintty\emojis\getemojis" "%configdir%\emojis" 2> nul:
+copy "%installdir%\usr\share\mintty\emojis\getflags" "%configdir%\emojis" 2> nul:
 
 rem create config file if it does not yet exist
 if exist "%configdir%\config" goto appconfig
diff --git a/makefile b/makefile
index 796a04b..3b7d6d4 100644
--- a/makefile
+++ b/makefile
@@ -216,7 +216,7 @@ mintty-pkg:
 
 mintty-appx:
 	mkdir -p usr/share/mintty
-	cd usr/share/mintty; mkdir -p lang themes sounds info
+	cd usr/share/mintty; mkdir -p lang themes sounds info emojis
 	cp mintty-$(minttyver)/lang/*.po usr/share/mintty/lang/
 	cp mintty-$(minttyver)/themes/*[!~] usr/share/mintty/themes/
 	cp mintty-$(minttyver)/sounds/*.wav usr/share/mintty/sounds/
@@ -224,6 +224,7 @@ mintty-appx:
 	# add charnames.txt to support "Character Info"
 	cd mintty-$(minttyver)/src; sh ./mknames
 	cp mintty-$(minttyver)/src/charnames.txt usr/share/mintty/info/
+	cp /usr/share/mintty/emojis/get*[!~] usr/share/mintty/emojis/
 
 cygwin:	# mkshortcutexe
 	mkdir -p bin
@@ -276,6 +277,7 @@ copcab:	ver
 	cp *.bat $(CAB)/
 	cp config-distros.sh $(CAB)/
 	cp mkshortcut.vbs $(CAB)/
+	cp mintty-$(minttyver)/tools/get*[!~] $(CAB)/
 
 cop:	copcab
 	mkdir -p rel
diff --git a/makewinx.cfg b/makewinx.cfg
index f62cd1c..39f0534 100644
--- a/makewinx.cfg
+++ b/makewinx.cfg
@@ -61,6 +61,8 @@ FILE25="mkshortcut.vbs"
 FILE26="dequote.bat"
 FILE27="cmd2.bat"
 FILE28="install-portable.bat"
+FILE29="getemojis"
+FILE30="getflags"
 
 [SourceFiles]
 SourceFiles0=.
@@ -95,4 +97,6 @@ SourceFiles0=.
 %FILE26%=
 %FILE27%=
 %FILE28%=
+%FILE29%=
+%FILE30%=