diff --git a/CHANGELOG b/CHANGELOG
index 8a7978d3..5ab1a0eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,9 @@ Version 3.0.2
         
         nightmare was renamed to nightmaremoon for consistency whit the 
         comic
+        
+        doctor has ben reintegrated to ponies thanks to official comic
+        issue 8 where is sit alongside drhooves
 
         Turkish manual page added.
 
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 63162ae6..67095b1e 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -3270,6 +3270,10 @@ from 40 to 60, to wrap messages better.
 @file{nightmare} has renamed into @file{nightmaremoon} for concistency 
 with the comic
 @item
+@file{doctor} has ben reintegrated to ponies thanks to official comic
+issue 8 where @file{drhooves} is siting alongside @file{doctor} and in
+front of @file{celestia}
+@item
 Added manpage for @command{ponysay-tool}
 @item
 Turkish manual page added.
diff --git a/extraponies/doctor.pony b/ponies/doctor.pony
similarity index 100%
rename from extraponies/doctor.pony
rename to ponies/doctor.pony
diff --git a/extrattyponies/doctor.pony b/ttyponies/doctor.pony
similarity index 100%
rename from extrattyponies/doctor.pony
rename to ttyponies/doctor.pony