diff --git a/src/texdepends.dtx b/src/texdepends.dtx
index 93a16ab2b62768e930ffe3b7a2c2da74956e78b5..830f2e92b166729025148e63dbb108fd1d68b97c 100644
--- a/src/texdepends.dtx
+++ b/src/texdepends.dtx
@@ -100,7 +100,7 @@
 %   This package allows \LaTeX\space to automatically generate
 %   dependencies while compiling documents.
 % \end{abstract}
-% \CheckSum{793}
+% \CheckSum{801}
 %
 % \changes{v1.0.1}{2005/03/22}{Version 1.0.1 at last}
 % \changes{v1.0.2}{2005/10/22}{Add support for package index.sty}
@@ -268,6 +268,7 @@
 % \begin{macro}{\TD@warning}
 % To write a warning
 %    \begin{macrocode}
+\RequirePackage{xstring}%
 \newcommand{\TD@warning}[1]{%
   \PackageWarningNoLine{texdepends}{#1}%
 }%
@@ -317,7 +318,13 @@
 %   We write something in the file
 %    \begin{macrocode}
 \def\TD@print#1{%
-  \immediate\write\TD@write{#1}%
+  {%
+    % TODO: fix pb when #1 contains '#'
+    %\noexpandarg%
+    \StrSubstitute{#1}{//}{/}[\TD@write@text]%
+    \immediate\write\TD@write{\TD@write@text}%
+    %\immediate\write\TD@write{#1}%
+  }
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -373,7 +380,7 @@
 % A file is missing. |texdepend| will try to skip it this time,
 %   but it will be needed at the next compilation
 %    \begin{macrocode}
-\def\TD@printRequiredFile#1{%
+\def\TD@printRequiredFile#1#2{%
   \TD@print{TD_\jobname\TD@extention _REQUIRED\space += #1}%
 }%
 %    \end{macrocode}
@@ -381,7 +388,9 @@
 % \begin{macro}{\RequireFile}
 % LaTeX users can directly declare a dependencie
 %    \begin{macrocode}
-\let\RequireFile\TD@printRequiredFile
+\def\RequireFile#1{%
+  \TD@printRequiredFile{#1}{User}%
+}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\TD@printOut}
@@ -799,7 +808,7 @@
     \PackageWarning{texdepends}{Figure '#1' needed\MessageBreak 
       Skipping it this time (the last one however)\MessageBreak}%
     \TD@missingDepends%
-    \TD@printRequiredFile{#1}%
+    \TD@printRequiredFile{#1}{eps}%
   }%
 }%
 \def\TD@Ginclude@pdf#1{%
@@ -809,7 +818,7 @@
     \PackageWarning{texdepends}{Figure '#1' needed\MessageBreak 
       Skipping it this time (the last one however)\MessageBreak}%
     \TD@missingDepends%
-    \TD@printRequiredFile{#1}%
+    \TD@printRequiredFile{#1}{pdf}%
   }%
 }%
 \def\TD@graphicspath#1{%
@@ -863,7 +872,7 @@
     \PackageWarning{texdepends}{Figure '#2' needed\MessageBreak 
       Skipping it this time (the last one however)\MessageBreak}%
     \TD@missingDepends%
-    \TD@printRequiredFile{#2}%
+    \TD@printRequiredFile{#2}{rawtexgraphics}%
   }%
 }%
 
@@ -874,7 +883,7 @@
     \PackageWarning{texdepends}{Figure '#1' needed\MessageBreak 
       Skipping it this time (the last one however)\MessageBreak}%
     \TD@missingDepends%
-    \TD@printRequiredFile{#1}%
+    \TD@printRequiredFile{#1}{rawtex}%
   }%
 }%
 
@@ -893,7 +902,7 @@
         Skipping it this time (the last one however)\MessageBreak}%
     }
     \TD@missingDepends%
-    \TD@printRequiredFile{#1}%
+    \TD@printRequiredFile{#1}{figtex}%
   }%
 }%
 % \@Ginclude@svgtex
@@ -911,7 +920,7 @@
         Skipping it this time (the last one however)\MessageBreak}%
     }
     \TD@missingDepends%
-    \TD@printRequiredFile{#1}%
+    \TD@printRequiredFile{#1}{svgtex}%
   }%
 }%
 
@@ -947,7 +956,7 @@
 }%
 % \FL@subfig@check
 \def\TD@FL@subfig@check#1{%
-  \TD@printRequiredFile{#1}%
+  \TD@printRequiredFile{#1}{subfigcheck}%
   \TD@printSubfig{#1}%
 }%
 %