diff --git a/apps/metadata/wave.c b/apps/metadata/wave.c
index 93c4d8309c..45acea1fa1 100644
--- a/apps/metadata/wave.c
+++ b/apps/metadata/wave.c
@@ -62,7 +62,8 @@ enum {
 #define WAVE_CHUNKNAME_LENGTH 4
 #define WAVE_CHUNKSIZE_LENGTH 4
 
-static const unsigned char *wave_chunklist = "RIFF"
+static const unsigned char * const wave_chunklist 
+                                           = "RIFF"
                                              "WAVE"
                                              "fmt "
                                              "fact"
@@ -73,7 +74,7 @@ static const unsigned char *wave_chunklist = "RIFF"
 #define WAVE64_CHUNKNAME_LENGTH 16
 #define WAVE64_CHUNKSIZE_LENGTH 8
 
-static const unsigned char *wave64_chunklist
+static const unsigned char * const wave64_chunklist
                  = "riff\x2e\x91\xcf\x11\xa5\xd6\x28\xdb\x04\xc1\x00\x00"
                    "wave\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
                    "fmt \xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index d6fd847f08..a6c015aebf 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -130,7 +130,7 @@ static bool kbd_loaded = false;
 
 #ifdef HAVE_MORSE_INPUT
 /* FIXME: We should put this to a configuration file. */
-static const char *morse_alphabets =
+static const char * const morse_alphabets =
     "abcdefghijklmnopqrstuvwxyz1234567890,.?-@ ";
 static const unsigned char morse_codes[] = {
     0x05,0x18,0x1a,0x0c,0x02,0x12,0x0e,0x10,0x04,0x17,0x0d,0x14,0x07,
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 99ef3f5587..ef642b1e3c 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -192,14 +192,14 @@ struct master_header {
 };
 
 /* For the endianess correction */
-static const char *tagfile_entry_ec   = "ll";
+static const char * const tagfile_entry_ec   = "ll";
 /**
  Note: This should be (1 + TAG_COUNT) amount of l's.
  */
-static const char *index_entry_ec     = "llllllllllllllllllllll";
+static const char * const index_entry_ec     = "llllllllllllllllllllll";
 
-static const char *tagcache_header_ec = "lll";
-static const char *master_header_ec   = "llllll";
+static const char * const tagcache_header_ec = "lll";
+static const char * const master_header_ec   = "llllll";
 
 static struct master_header current_tcmh;
 
diff --git a/firmware/target/arm/imx31/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c
index 006b065ea5..094fbaa58b 100644
--- a/firmware/target/arm/imx31/mc13783-imx31.c
+++ b/firmware/target/arm/imx31/mc13783-imx31.c
@@ -31,7 +31,7 @@ extern struct spi_node mc13783_spi;
 
 /* PMIC event service data */
 static int mc13783_thread_stack[DEFAULT_STACK_SIZE/sizeof(int)];
-static const char *mc13783_thread_name = "pmic";
+static const char * const mc13783_thread_name = "pmic";
 static struct semaphore mc13783_svc_wake;
 
 /* Synchronous thread communication objects */