diff --git a/src/output.cpp b/src/output.cpp
index b441a8ca4252b..be21fc3f60cf7 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -1610,6 +1610,10 @@ void replace_name_tags( std::string &input )
         replace_substring( input, "<given_name>", Name::get( nameIsGivenName ),
                            false );
     }
+    while( input.find( "<town_name>" ) != std::string::npos ) {
+        replace_substring( input, "<town_name>", Name::get( nameIsTownName ),
+                           false );
+    }
 }
 
 void replace_city_tag( std::string &input, const std::string &name )