diff --git a/src/Makefile.include b/src/Makefile.include
index 6888b3484..56c717049 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -8,7 +8,7 @@ default: debug
 
 DEPEND  = @gcc -MM -MG -r
 AR      = @ar
-CTAGS   = @ctags
+CTAGS   = @ctags-exuberant
 CC      = @gcc
 LD      = @gcc
 INSTALL = @cp
@@ -16,7 +16,7 @@ INSTALL = @cp
 
 
 ARFLAGS = crs
-CTAGSFLAGS = --langmap=c:.c.h --c-types=-m
+CTAGSFLAGS = --c-types=cdefgmnstuv
 CFLAGS  = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
            -Wpointer-arith -Werror-implicit-function-declaration \
 		   -Wno-char-subscripts $(INCLUDES)
@@ -120,7 +120,7 @@ endif
 #
 ## Tags
 #
-tags: depend
+tags:
 	@echo "Creating tags in `pwd`/tags";
 	$(CTAGS) $(CTAGSFLAGS) --recurse=yes -f $(ERESSEA)/tags $(ERESSEA)
 
diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index 5de96cb56..7b4ee16f4 100644
--- a/src/common/gamecode/randenc.c
+++ b/src/common/gamecode/randenc.c
@@ -1076,7 +1076,7 @@ randomevents(void)
 	}
 
 
-#if RACE_ADJUSTMENTS
+#if RACE_ADJUSTMENTS == 0
 	/* Orks vermehren sich */
 
 	for (r = regions; r; r = r->next) {
diff --git a/src/corwin.mk b/src/corwin.mk
index b00f12521..524d435af 100644
--- a/src/corwin.mk
+++ b/src/corwin.mk
@@ -7,7 +7,7 @@ endif
 CC      = gcc-3.0 -D_GNU_SOURCE
 # CC      = gcc -D_GNU_SOURCE
 AR      = ar
-CTAGS   = ctags
+CTAGS   = ctags-exuberant
 LD      = gcc-3.0
 INSTALL = cp
 CFLAGS  += -march=athlon -minline-all-stringops
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index ed43c069c..367b12bb9 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -2611,6 +2611,28 @@ peasant_adjustment(void)
 
 	return 0;
 }
+
+static int
+orc_conversion(void)
+{
+		faction *f;
+		unit *u;
+
+		for(f=factions; f; f=f->next) {
+			for(u=f->units; u; u=u->next) {
+				if(u->race == new_race[RC_ORC]) {
+					/* convert to either uruk or snotling */
+					if(effskill(u, SK_MAGIC) >= 1
+							|| effskill(u, SK_ALCHEMY) >= 1)
+						  || get_item(u, I_CHASTITY_BELT) >= u->number) {
+						u->race = new_race[RC_URUK];
+					} else {
+						u->race = new_race[RC_SNOT];
+					}
+				}
+			}
+		}
+}
 #endif
 
 static int
@@ -2776,6 +2798,7 @@ korrektur_end(void)
 #endif
 #if PEASANT_ADJUSTMENT == 1
 	do_once("peas", peasant_adjustment());
+	do_once("orcc", orc_conversion());
 #endif
 
 }