diff --git a/Makedefs b/Makedefs
index b6fef99..f9ef3aa 100644
--- a/Makedefs
+++ b/Makedefs
@@ -6,6 +6,10 @@
 OPT := -O3 -DNDEBUG
 # OPT := -O3
 
+# Backend configuration flags
+# PANASAS_OSD=1
+# PANASAS_OSDSIM=1 # (ignored if PANASAS_OSD=0)
+
 # Define this to build a pvfs2-server executable with an embedded OSD target
 # inside it.
 #PVFS_OSD_INTEGRATED := 1
diff --git a/Makefile b/Makefile
index e6136b6..f891158 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # Top level Makefile to build everything
 
+-include Makedefs
+
 MK_PATH ?= $(PWD)
 util := $(MK_PATH)/osd-util
 tgt := $(MK_PATH)/tgt
@@ -28,15 +30,23 @@ target: util
 target_clean:
 	$(MAKE) -C $(target) clean
 
+OTGTD = otgtd
+ifeq ($(PANASAS_OSD),1)
+	OTGTD = pan_tgtd
+	ifeq ($(PANASAS_OSDSIM),1)
+		OTGTD = pansim_tgtd
+	endif
+endif
+
 .PHONY: stgt stgt_checkpatch stgt_tgt_only stgt_clean
 stgt: target
-	$(MAKE) OSDEMU=1 ISCSI=1 -C $(tgt)/usr
+	$(MAKE) OSDEMU=1 ISCSI=1 TGTD=$(OTGTD) -C $(tgt)/usr
 
 stgt_checkpatch:
 	cd $(tgt);git show | $(CHECKPATCH) - |  $(checkpatch_2_kdev) $(PWD)/$(tgt)
 
 stgt_tgt_only:
-	$(MAKE) ISCSI=1 IBMVIO=1 ISCSI_RDMA=1 FCP=1 FCOE=1 OSDEMU=1 -C $(tgt)/usr
+	$(MAKE) ISCSI=1 IBMVIO=1 ISCSI_RDMA=1 FCP=1 FCOE=1 -C $(tgt)/usr
 
 stgt_clean:
 	$(MAKE) -C $(tgt)/usr clean
diff --git a/osd-target/Makefile b/osd-target/Makefile
index 4726cb1..8f868a2 100644
--- a/osd-target/Makefile
+++ b/osd-target/Makefile
@@ -2,10 +2,6 @@
 # OSD target makefile
 #
 
-#configuration flags
-PANASAS_OSD=1
-PANASAS_OSDSIM=1
-
 -include ../Makedefs
 
 SRC := attr.c db.c obj.c osd-schema.c osd.c cdb.c osd-sense.c list-entry.c
@@ -87,7 +83,7 @@ $(STGTLIB): STGT
 $(UTILLIB): UTIL
 	make -C $(UTILDIR)
 
-%.o: %.c Makefile
+%.o: %.c Makefile ../Makedefs
 	$(CC) $(CFLAGS) -c $< -o $@
 
 osd-schema.c: osd.schema
diff --git a/up b/up
index 9c939f6..23ea42f 100755
--- a/up
+++ b/up
@@ -8,12 +8,13 @@ BACKSTORE2=/usr0/var/osd-tgt/tgt-2/
 BACKSTORE3=/usr0/var/osd-tgt/tgt-3/
 
 TGTADM=./tgt/usr/tgtadm
+OTGTD=./tgt/usr/otgtd
 # -f - forgraound
 # -d - debug level
 # DEBUG="-d 9"
 DEBUG=""
 
-./tgt/usr/tgtd $DEBUG -f &
+$OTGTD $DEBUG -f &
 
 sleep 2
 $TGTADM --lld iscsi --mode target --op new --tid 1 --targetname $(hostname)