diff --git a/src/main.c b/src/main.c
index ff3d234..52bbafe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1061,11 +1061,13 @@
 		    && scriptin[curscript] == NULL
 		    && !global_busy;
 
+#ifdef FEAT_JOB_CHANNEL
     if (was_safe != is_safe)
 	// Only log when the state changes, otherwise it happens at nearly
 	// every key stroke.
 	ch_log(NULL, is_safe ? "Start triggering SafeState"
 						: "Stop triggering SafeState");
+#endif
     if (is_safe)
 	apply_autocmds(EVENT_SAFESTATE, NULL, NULL, FALSE, curbuf);
     was_safe = is_safe;
@@ -1079,8 +1081,10 @@
     void
 state_no_longer_safe(void)
 {
+#ifdef FEAT_JOB_CHANNEL
     if (was_safe)
 	ch_log(NULL, "safe state reset");
+#endif
     was_safe = FALSE;
 }
 
@@ -1093,11 +1097,15 @@
 {
     if (was_safe)
     {
+#ifdef FEAT_JOB_CHANNEL
 	ch_log(NULL, "Leaving unsafe area, triggering SafeStateAgain");
+#endif
 	apply_autocmds(EVENT_SAFESTATEAGAIN, NULL, NULL, FALSE, curbuf);
     }
+#ifdef FEAT_JOB_CHANNEL
     else
 	ch_log(NULL, "Leaving unsafe area, not triggering SafeStateAgain");
+#endif
 }
 
 
diff --git a/src/version.c b/src/version.c
index b8c8808..1f120d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2049,
+/**/
     2048,
 /**/
     2047,