diff --git a/ChangeLog b/ChangeLog
index da7a447f..62aec1c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.4:
+*03/06/29:
+   * Add chbg support to fbsetbg (Thanks Han)
+     fbsetbg
 *03/06/28:
    * Fix slit netizens (e.g. withdrawn pager)  (Simon)
      Slit.cc WinClient.cc Screen.cc
diff --git a/util/fbsetbg b/util/fbsetbg
index 045e1726..e438494d 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -23,7 +23,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# $Id: fbsetbg,v 1.7 2003/06/06 02:18:34 rathnor Exp $
+# $Id: fbsetbg,v 1.8 2003/06/29 08:22:24 rathnor Exp $
 
 #
 # Portability notes:
@@ -39,7 +39,7 @@
 #
 
 # The wallpapersetter is selected in this order
-wpsetters='Esetroot wmsetbg display qiv xv xsri xli xsetbg' # broken icewmbg'
+wpsetters='chbg Esetroot wmsetbg display qiv xv xsri xli xsetbg' # broken icewmbg'
 lastwallpaper=${HOME}/.fluxbox/lastwallpaper
 
 
@@ -144,6 +144,12 @@ xchat won't work right with it. Consider using wmsetbg (from windowmaker)
 or Esetroot (from Eterm)"
 
 case $WPSETTER in
+    chbg)
+        full='-once -mode maximize'
+        tile='-once -mode tile'
+        center='-once -mode center'
+        aspect='-once -mode smart -max_grow 100 -max_size 100'
+        debugstory="chbg is a nice app. You won't have any problems."
     xsri)
 	full='--center-x --center-y --scale-width=100 --scale-width=100'
 	tile='--tile'