diff --git a/gdat.m b/gdat.m
index 30fe8e7c74e64c7b98b513cf132b1cd75b8e98a8..590c32e0c88862fd29a77cb034f58291921e8467 100644
--- a/gdat.m
+++ b/gdat.m
@@ -51,7 +51,7 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
 % optional arguments valid for all values of data_type (not passed on to loadMACHINEdata function):
 %
 % varargin{1}:  0 => no plot (default), 1 => plot 
-% varargin{2}:  machine name 'JET' , 'TCV' (default: JET or TCV, depending on where implemented)
+% varargin{2}:  machine name 'AUG', 'JET' , 'TCV' (default: depending on where implemented)
 %
 % Additional input arguments for specific traces (passed on to loadMACHINEdata function)
 %
@@ -81,7 +81,7 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
 %                varargout{1}: see help loadTCVdata
 %
 %
-% functions needed: loadTCVdata, loadJETdata
+% functions needed: loadAUGdata, loadJETdata, loadTCVdata
 %                  
 %
 % Examples:
@@ -110,7 +110,11 @@ doplot=0;
 if (nargineff>=3 & ~isempty(varargin{1})); doplot=varargin{1}; end
 machine='TCV';
 a=which('sawteeth');
-if ~isempty(findstr('osauter',a)); machine='JET'; end
+if ~isempty(findstr('ipp',a)) | ~isempty(findstr('/u/osauter',a));
+  machine='AUG';
+elseif ~isempty(findstr('/home/osauter',a));
+  machine='JET';
+end
 if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
 
 % load data from specified machine