diff --git a/.gitattributes b/.gitattributes
index fca21fb8cf..89a8887a53 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1613,14 +1613,14 @@ debugger/debuggerdlg.pp svneol=native#text/pascal
 debugger/evaluatedlg.lfm svneol=native#text/plain
 debugger/evaluatedlg.lrs svneol=native#text/pascal
 debugger/evaluatedlg.pp svneol=native#text/pascal
+debugger/fpdebug/fpd/README.txt svneol=native#text/plain
+debugger/fpdebug/fpd/fpwd.lpr svneol=native#text/pascal
+debugger/fpdebug/fpd/fpwdcommand.pas svneol=native#text/pascal
+debugger/fpdebug/fpd/fpwdglobal.pas svneol=native#text/pascal
+debugger/fpdebug/fpd/fpwdloop.pas svneol=native#text/pascal
+debugger/fpdebug/fpd/fpwdpeimage.pas svneol=native#text/pascal
+debugger/fpdebug/fpd/fpwdtype.pas svneol=native#text/pascal
 debugger/fpdebug/fpdd/fpdumpdwarf.lpr svneol=native#text/pascal
-debugger/fpdebug/fpwd/README.txt svneol=native#text/plain
-debugger/fpdebug/fpwd/fpwd.lpr svneol=native#text/pascal
-debugger/fpdebug/fpwd/fpwdcommand.pas svneol=native#text/pascal
-debugger/fpdebug/fpwd/fpwdglobal.pas svneol=native#text/pascal
-debugger/fpdebug/fpwd/fpwdloop.pas svneol=native#text/pascal
-debugger/fpdebug/fpwd/fpwdpeimage.pas svneol=native#text/pascal
-debugger/fpdebug/fpwd/fpwdtype.pas svneol=native#text/pascal
 debugger/fpdebug/test/asmtest.lpi svneol=native#text/plain
 debugger/fpdebug/test/asmtest.lpr svneol=native#text/pascal
 debugger/fpdebug/test/asmtestunit.lfm svneol=native#text/plain
diff --git a/.gitignore b/.gitignore
index eebb3a9db4..23e3cd2e69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,10 +159,10 @@ debian/*.bak
 debian/units
 debugger/*.bak
 debugger/fpdebug/*.bak
+debugger/fpdebug/fpd/*.bak
+debugger/fpdebug/fpd/units
 debugger/fpdebug/fpdd/*.bak
 debugger/fpdebug/fpdd/units
-debugger/fpdebug/fpwd/*.bak
-debugger/fpdebug/fpwd/units
 debugger/fpdebug/test/*.bak
 debugger/fpdebug/test/units
 debugger/fpdebug/units
diff --git a/debugger/fpdebug/fpwd/README.txt b/debugger/fpdebug/fpd/README.txt
similarity index 54%
rename from debugger/fpdebug/fpwd/README.txt
rename to debugger/fpdebug/fpd/README.txt
index 2e7721dd12..fc23dafbb5 100644
--- a/debugger/fpdebug/fpwd/README.txt
+++ b/debugger/fpdebug/fpd/README.txt
@@ -1,9 +1,9 @@
  ---------------------------------------------------------------------------
- fpwd  -  FP standalone windows debugger
+ fpd  -  FP standalone debugger
  ---------------------------------------------------------------------------
 
- fpwd is a concept Free Pascal Windows Debugger. It is mainly used to thest
- the windebugger classes, but it may grow someday to a fully functional
+ fpd is a concept Free Pascal Debugger. It is mainly used to test
+ the debugger classes, but it may grow someday to a fully functional
  debugger written in pascal. I hope you enjoy it.
 
  Marc Weustink
diff --git a/debugger/fpdebug/fpwd/fpwd.lpr b/debugger/fpdebug/fpd/fpwd.lpr
similarity index 100%
rename from debugger/fpdebug/fpwd/fpwd.lpr
rename to debugger/fpdebug/fpd/fpwd.lpr
diff --git a/debugger/fpdebug/fpwd/fpwdcommand.pas b/debugger/fpdebug/fpd/fpwdcommand.pas
similarity index 100%
rename from debugger/fpdebug/fpwd/fpwdcommand.pas
rename to debugger/fpdebug/fpd/fpwdcommand.pas
diff --git a/debugger/fpdebug/fpwd/fpwdglobal.pas b/debugger/fpdebug/fpd/fpwdglobal.pas
similarity index 100%
rename from debugger/fpdebug/fpwd/fpwdglobal.pas
rename to debugger/fpdebug/fpd/fpwdglobal.pas
diff --git a/debugger/fpdebug/fpwd/fpwdloop.pas b/debugger/fpdebug/fpd/fpwdloop.pas
similarity index 100%
rename from debugger/fpdebug/fpwd/fpwdloop.pas
rename to debugger/fpdebug/fpd/fpwdloop.pas
diff --git a/debugger/fpdebug/fpwd/fpwdpeimage.pas b/debugger/fpdebug/fpd/fpwdpeimage.pas
similarity index 100%
rename from debugger/fpdebug/fpwd/fpwdpeimage.pas
rename to debugger/fpdebug/fpd/fpwdpeimage.pas
diff --git a/debugger/fpdebug/fpwd/fpwdtype.pas b/debugger/fpdebug/fpd/fpwdtype.pas
similarity index 100%
rename from debugger/fpdebug/fpwd/fpwdtype.pas
rename to debugger/fpdebug/fpd/fpwdtype.pas