diff --git a/changelog b/changelog
index 9923a73c438..207002ac49d 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,8 @@ Version 1.7.13+svn:
      leader (Debian bug #555964)
    * Fix bug #15382 (Player doesn't get transported to the next scenario)
    * Fix bug #15391 (Warnings in multiplayer games)
+ * Miscellaneous and bug fixes:
+   * Fix bug #15429 (Units created by WML can only get the Neutral alignment)
 
 Version 1.7.13-1.8beta6:
  * AI:
diff --git a/players_changelog b/players_changelog
index 325c8b2844b..463f1feebb0 100644
--- a/players_changelog
+++ b/players_changelog
@@ -26,6 +26,9 @@ Version 1.7.13-1.8beta6:
  * User interface:
    * Fold several player groups by default in the lobby.
 
+ * Miscellaneous and bugfixes:
+   * Fix WML-generated units receiving only the Neutral alignment.
+
 
 Version 1.7.12-1.8beta5:
  * Campaigns:
diff --git a/src/unit.cpp b/src/unit.cpp
index 333b46591e4..20a2ca5ea6e 100644
--- a/src/unit.cpp
+++ b/src/unit.cpp
@@ -492,7 +492,7 @@ unit::unit(unit_map* unitmap, const config& cfg,
 		alignment_ = unit_type::NEUTRAL;
 	} else if(cfg["alignment"]=="chaotic") {
 		alignment_ = unit_type::CHAOTIC;
-	} else {
+	} else if(cfg["alignment"]!="") {
 		alignment_ = unit_type::NEUTRAL;
 	}