diff --git a/src/batchjob.py b/src/batchjob.py
index 3907bda5f3a14c2b90b0c998ac858f7a878b9af6..ed9d155abe60e6df33314262af4dd293c3792833 100644
--- a/src/batchjob.py
+++ b/src/batchjob.py
@@ -77,6 +77,7 @@ class PBSJob(BatchJob):
         from subprocess import Popen
         args = [
             "-N", self.moniker,
+            "-d", self.subdir,
             ]
 
         from os import getenv
@@ -94,6 +95,16 @@ class PBSJob(BatchJob):
 
 
 
+def guess_job_class():
+    from subprocess import Popen, PIPE, STDOUT
+    qstat_helplines = Popen(["qstat", "--help"], 
+            stdout=PIPE, stderr=STDOUT).communicate()[0].split("\n")
+    if qstat_helplines[0].startswith("GE"):
+        return GridEngineJob
+    else:
+        return PBSJob
+
+
 class ConstructorPlaceholder:
     def __init__(self, classname, *args, **kwargs):
         self.classname = classname