--- a/src/fslview/preferences.cpp
+++ b/src/fslview/preferences.cpp
@@ -152,7 +152,7 @@
   if(m_impl->m_fsldir == "")
     m_impl->m_fsldir = readEntry("/fsl/fsldir", "").ascii();
   if(m_impl->m_fsldir == "")
-    m_impl->m_fsldir = string(getenv("FSLDIR") ? getenv("FSLDIR") : "/usr/local/fsl");
+    m_impl->m_fsldir = string(getenv("FSLDIR") ? getenv("FSLDIR") : "/usr/share/fsl");
 
   return m_impl->m_fsldir; 
 }
@@ -175,6 +175,8 @@
 string Preferences::inqAssistantPath()
 {
   if(m_impl->m_assistantpath == "")
+    m_impl->m_assistantpath = string("/usr/bin");
+  if(m_impl->m_assistantpath == "")
     m_impl->m_assistantpath = readEntry("/qt/assistantpath","").ascii();
   if(m_impl->m_assistantpath == "")
     m_impl->m_assistantpath = string(getenv("FSLQTASSISTANTPATH") ? 
diff --git a/src/fslview/assistantclient.cpp b/src/fslview/assistantclient.cpp
index 1f2c05e..1daa3db 100644
--- a/src/fslview/assistantclient.cpp
+++ b/src/fslview/assistantclient.cpp
@@ -33,7 +33,9 @@ AssistantClient* AssistantClient::getInstance()
 AssistantClient::AssistantClient(const QString& path):
   QAssistantClient( path, qApp->mainWidget())
 {
-  m_docPath = Preferences::getInstance()->inqFSLDir().c_str() + QString("/doc/fslview");
+  // Debian specific path setting
+  //m_docPath = Preferences::getInstance()->inqFSLDir().c_str() + QString("/doc/fslview");
+  m_docPath = QString("/usr/share/doc/fslview-doc/html");
   QStringList args;
 
   args << "-profile" << QString("%1/fslview.adp").arg(m_docPath);
