diff --git a/dhtml/dhtml.spec b/dhtml/dhtml.spec
index f5400702af..41144a7c49 100644
--- a/dhtml/dhtml.spec
+++ b/dhtml/dhtml.spec
@@ -34,6 +34,7 @@
 %define       V_os3grid        0.6
 %define       V_toolman        0.2
 %define       V_behaviour      1.1
+%define       V_wikiwyg        0.12
 
 #   package information
 Name:         dhtml
@@ -45,8 +46,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Web
 License:      Open Source
-Version:      20060122
-Release:      20060122
+Version:      20060124
+Release:      20060124
 
 #   list of sources
 Source0:      http://prototype.conio.net/dist/prototype-%{V_prototype}.tar.gz
@@ -60,7 +61,8 @@ Source7:      http://osdn.dl.sourceforge.net/tinymce/tinymce_%{V_tinymce}.tgz
 Source8:      http://osdn.dl.sourceforge.net/os3grid/os3grid-%{V_os3grid}.tar.bz2
 Source9:      http://tool-man.org/examples/ToolManDHTML-%{V_toolman}.zip
 Source10:     ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/behaviour-%{V_behaviour}.js
-Source11:     dhtml.txt
+Source11:     http://openjsan.org/dist/i/in/ingy/Wikiwyg-%{V_wikiwyg}.tar.gz
+Source12:     dhtml.txt
 
 #   build information
 Prefix:       %{l_prefix}
@@ -131,6 +133,11 @@ AutoReqProv:  no
         url       = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
         regex     = behaviour-(__VER__)\.js
     }
+    prog dhtml:wikiwyg = {
+        version   = %{V_wikiwyg}
+        url       = http://openjsan.org/dist/i/in/ingy/
+        regex     = Wikiwyg-(__VER__)\.tar\.gz
+    }
 
 %prep
     %setup -q -c
@@ -138,6 +145,7 @@ AutoReqProv:  no
     %setup -q -T -D -a 2
     %setup -q -T -D -a 7
     %setup -q -T -D -a 8
+    %setup -q -T -D -a 11
     %{l_prefix}/bin/unzip -q -x %{SOURCE6}
     %{l_prefix}/bin/unzip -q -x %{SOURCE9}
 
@@ -155,7 +163,8 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/os3grid \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/ie7 \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/toolman \
-        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/behaviour
+        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/behaviour \
+        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/wikiwyg
     %{l_shtool} install -c -m 644 \
         prototype-%{V_prototype}/dist/*.js \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/prototype/
@@ -192,6 +201,13 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 \
         %{SOURCE dhtml.txt} \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/README
+    cp -r Wikiwyg-%{V_wikiwyg}/lib/* Wikiwyg-%{V_wikiwyg}/css/* \
+        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/wikiwyg/
+    cp -r Wikiwyg-%{V_wikiwyg}/images \
+        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/wikiwyg/images
+    %{l_shtool} subst \
+        -e 's;images/;/dhtml/wikiwyg/images/;g' \
+        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/wikiwyg/Wikiwyg/Toolbar.js
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files
diff --git a/dhtml/dhtml.txt b/dhtml/dhtml.txt
index 73594c911d..a39b2cbceb 100644
--- a/dhtml/dhtml.txt
+++ b/dhtml/dhtml.txt
@@ -59,3 +59,10 @@ To use these JavaScript libraries...
      <!-- Behaviour (http://bennolan.com/behaviour/) -->
      <script type="text/javascript" src="/dhtml/behaviour/behaviour.js"></script>     
 
+   - Wikiwyg
+     <!-- Wikiwyg (http://www.wikiwyg.net/) -->
+     <link rel="stylesheet" type="text/css" href="/dhtml/wikiwyg/wikiwyg.css"/>
+     <script type="text/javascript" src="/dhtml/wikiwyg/Wikiwyg.js"></script>
+     <script type="text/javascript" src="/dhtml/wikiwyg/Wikiwyg/Toolbar.js"></script>
+     <script type="text/javascript" src="/dhtml/wikiwyg/Wikiwyg/Wikitext.js"></script>
+