diff --git a/ChangeLog b/ChangeLog
index 01dfb7335..d8f57cc15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-06-15
+ChangeLog - 2005-06-16
 
 
 Version 0.1.3 (under dev!):
+   * fixed plugins "print" and "prnt" functions: now ok for writing on server
+     buffers
    * fixed color problem with new libcurses version
    * fixed crash when using Alt-S or Alt-X on DCC buffer (Alt-D)
    * fixed startup crash when config file (~/.weechat/weechat.rc) is not found
diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c
index aa35bbc36..7a7f194d7 100644
--- a/src/plugins/plugins.c
+++ b/src/plugins/plugins.c
@@ -424,9 +424,17 @@ plugin_find_buffer (char *server, char *channel)
     }
     else
     {
-        ptr_buffer = gui_current_window->buffer;
-        if (ptr_buffer->dcc)
-            ptr_buffer = gui_buffers;
+        if (!channel)
+        {
+            ptr_buffer = gui_current_window->buffer;
+            if (ptr_buffer->dcc)
+                ptr_buffer = gui_buffers;
+        }
+        else
+        {
+            if (ptr_server)
+                ptr_buffer = ptr_server->buffer;
+        }
     }
     
     if (!ptr_buffer)
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 01dfb7335..d8f57cc15 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-06-15
+ChangeLog - 2005-06-16
 
 
 Version 0.1.3 (under dev!):
+   * fixed plugins "print" and "prnt" functions: now ok for writing on server
+     buffers
    * fixed color problem with new libcurses version
    * fixed crash when using Alt-S or Alt-X on DCC buffer (Alt-D)
    * fixed startup crash when config file (~/.weechat/weechat.rc) is not found
diff --git a/weechat/src/plugins/plugins.c b/weechat/src/plugins/plugins.c
index aa35bbc36..7a7f194d7 100644
--- a/weechat/src/plugins/plugins.c
+++ b/weechat/src/plugins/plugins.c
@@ -424,9 +424,17 @@ plugin_find_buffer (char *server, char *channel)
     }
     else
     {
-        ptr_buffer = gui_current_window->buffer;
-        if (ptr_buffer->dcc)
-            ptr_buffer = gui_buffers;
+        if (!channel)
+        {
+            ptr_buffer = gui_current_window->buffer;
+            if (ptr_buffer->dcc)
+                ptr_buffer = gui_buffers;
+        }
+        else
+        {
+            if (ptr_server)
+                ptr_buffer = ptr_server->buffer;
+        }
     }
     
     if (!ptr_buffer)