diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c
index 65ebe5cbfe..2f6e3d7c9c 100644
--- a/src/WINNT/afsd/afsd_service.c
+++ b/src/WINNT/afsd/afsd_service.c
@@ -292,7 +292,9 @@ afsd_ServiceControlHandlerEx(
         /* XXX handle pause & continue */
     case SERVICE_CONTROL_POWEREVENT:                                              
         { 
-            afsi_log("SERVICE_CONTROL_POWEREVENT");
+#ifdef DEBUG
+	    afsi_log("SERVICE_CONTROL_POWEREVENT");
+#endif
             /*                                                                                
             **	dwEventType of this notification == WPARAM of WM_POWERBROADCAST               
             **	Return NO_ERROR == return TRUE for that message, i.e. accept request          
@@ -341,11 +343,15 @@ afsd_ServiceControlHandlerEx(
                     dwRet = NO_ERROR;                       
                     break;                                  
                 case PBT_APMPOWERSTATUSCHANGE:                                                    
-                    afsi_log("SERVICE_CONTROL_APMPOWERSTATUSCHANGE"); 
+#ifdef DEBUG
+		    afsi_log("SERVICE_CONTROL_APMPOWERSTATUSCHANGE");
+#endif
                     dwRet = NO_ERROR;                       
                     break;                                  
                 case PBT_APMOEMEVENT:                                                             
+#ifdef DEBUG
                     afsi_log("SERVICE_CONTROL_APMOEMEVENT"); 
+#endif
                     dwRet = NO_ERROR;                       
                     break;                                  
                 case PBT_APMRESUMEAUTOMATIC: