diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 2b9fbd6..e0b5c59 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2016.07.21.102919"
+#define Cdrskin_timestamP "2016.07.21.141139"
diff --git a/libburn/sg-netbsd.c b/libburn/sg-netbsd.c
index 6fe91a0..a4d6c6a 100644
--- a/libburn/sg-netbsd.c
+++ b/libburn/sg-netbsd.c
@@ -314,7 +314,7 @@ static int guess_size_by_seek_set(int fd, off_t *bytes, int flag)
 */
 int sg_id_string(char msg[1024], int flag)
 {
-#ifdef __OpenBSD___
+#ifdef __OpenBSD__
 	sprintf(msg, "internal OpenBSD SCIOCCOMMAND adapter sg-netbsd");
 #else
 	sprintf(msg, "internal NetBSD SCIOCCOMMAND adapter sg-netbsd");
@@ -694,19 +694,19 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 	if (addr.type != TYPE_SCSI)
 		{ret = 0; goto ex;}
 
-#ifdef __OpenBSD___
+#ifdef __OpenBSD__
 
 	*bus_no = *host_no = addr.scbus;
 	*target_no = addr.target;
 	*lun_no = addr.lun;
 
-#else /* __OpenBSD___ */
+#else /* __OpenBSD__ */
 
 	*bus_no = *host_no = addr.addr.scsi.scbus;
 	*target_no = addr.addr.scsi.target;
 	*lun_no = addr.addr.scsi.lun;
 
-#endif /* ! __OpenBSD___ */
+#endif /* ! __OpenBSD__ */
 
 	ret = 1;
 ex:;