diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 03f395541..ba8cc4fa2 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -239,7 +239,7 @@ armedmen(const unit * u)
item * itm;
int n = 0;
if (!(urace(u)->flags & RCF_NOWEAPONS)) {
- if (urace(u)->ec_flags & CANGUARD) {
+ if ((urace(u)->ec_flags & CANGUARD) || effskill(u, SK_WEAPONLESS)>=1) {
/* kann ohne waffen bewachen: fuer untote und drachen */
n = u->number;
} else {
diff --git a/src/res/races.xml b/src/res/races.xml
index 02108fd3b..42a0a3aec 100644
--- a/src/res/races.xml
+++ b/src/res/races.xml
@@ -713,6 +713,7 @@
+