diff --git a/tools/hcidump.c b/tools/hcidump.c
index 055c8fa..50123d2 100644
--- a/tools/hcidump.c
+++ b/tools/hcidump.c
@@ -252,15 +252,15 @@ static int process_frames(int dev, int sock, int fd, unsigned long flags)
 			if (flags & DUMP_BTSNOOP) {
 				uint64_t ts;
 				uint8_t pkt_type = ((uint8_t *) frm.data)[0];
-				dp->size = htonl(frm.data_len);
+				dp->size = htobe32(frm.data_len);
 				dp->len  = dp->size;
-				dp->flags = ntohl(frm.in & 0x01);
+				dp->flags = be32toh(frm.in & 0x01);
 				dp->drops = 0;
 				ts = (frm.ts.tv_sec - 946684800ll) * 1000000ll + frm.ts.tv_usec;
-				dp->ts = hton64(ts + 0x00E03AB44A676000ll);
+				dp->ts = htobe64(ts + 0x00E03AB44A676000ll);
 				if (pkt_type == HCI_COMMAND_PKT ||
 						pkt_type == HCI_EVENT_PKT)
-					dp->flags |= ntohl(0x02);
+					dp->flags |= be32toh(0x02);
 			} else {
 				dh->len = htobs(frm.data_len);
 				dh->in  = frm.in;
@@ -330,11 +330,11 @@ static void read_dump(int fd)
 				frm.in = 1;
 				break;
 			default:
-				lseek(fd, ntohl(ph.len) - 9, SEEK_CUR);
+				lseek(fd, be32toh(ph.len) - 9, SEEK_CUR);
 				continue;
 			}
 
-			frm.data_len = ntohl(ph.len) - 8;
+			frm.data_len = be32toh(ph.len) - 8;
 			err = read_n(fd, frm.data + 1, frm.data_len - 1);
 		} else if (parser.flags & DUMP_BTSNOOP) {
 			uint32_t opcode;
@@ -342,8 +342,8 @@ static void read_dump(int fd)
 
 			switch (btsnoop_type) {
 			case 1001:
-				if (ntohl(dp.flags) & 0x02) {
-					if (ntohl(dp.flags) & 0x01)
+				if (be32toh(dp.flags) & 0x02) {
+					if (be32toh(dp.flags) & 0x01)
 						pkt_type = HCI_EVENT_PKT;
 					else
 						pkt_type = HCI_COMMAND_PKT;
@@ -352,17 +352,17 @@ static void read_dump(int fd)
 
 				((uint8_t *) frm.data)[0] = pkt_type;
 
-				frm.data_len = ntohl(dp.len) + 1;
+				frm.data_len = be32toh(dp.len) + 1;
 				err = read_n(fd, frm.data + 1, frm.data_len - 1);
 				break;
 
 			case 1002:
-				frm.data_len = ntohl(dp.len);
+				frm.data_len = be32toh(dp.len);
 				err = read_n(fd, frm.data, frm.data_len);
 				break;
 
 			case 2001:
-				opcode = ntohl(dp.flags) & 0xffff;
+				opcode = be32toh(dp.flags) & 0xffff;
 
 				switch (opcode) {
 				case 2:
@@ -396,7 +396,7 @@ static void read_dump(int fd)
 
 				((uint8_t *) frm.data)[0] = pkt_type;
 
-				frm.data_len = ntohl(dp.len) + 1;
+				frm.data_len = be32toh(dp.len) + 1;
 				err = read_n(fd, frm.data + 1, frm.data_len - 1);
 			}
 		} else {
@@ -414,13 +414,13 @@ static void read_dump(int fd)
 
 		if (parser.flags & DUMP_PKTLOG) {
 			uint64_t ts;
-			ts = ntoh64(ph.ts);
+			ts = be64toh(ph.ts);
 			frm.ts.tv_sec = ts >> 32;
 			frm.ts.tv_usec = ts & 0xffffffff;
 		} else if (parser.flags & DUMP_BTSNOOP) {
 			uint64_t ts;
-			frm.in = ntohl(dp.flags) & 0x01;
-			ts = ntoh64(dp.ts) - 0x00E03AB44A676000ll;
+			frm.in = be32toh(dp.flags) & 0x01;
+			ts = be64toh(dp.ts) - 0x00E03AB44A676000ll;
 			frm.ts.tv_sec = (ts / 1000000ll) + 946684800ll;
 			frm.ts.tv_usec = ts % 1000000ll;
 		} else {
@@ -464,8 +464,8 @@ static int open_file(char *file, int mode, unsigned long flags)
 		if (!memcmp(hdr->id, btsnoop_id, sizeof(btsnoop_id))) {
 			parser.flags |= DUMP_BTSNOOP;
 
-			btsnoop_version = ntohl(hdr->version);
-			btsnoop_type = ntohl(hdr->type);
+			btsnoop_version = be32toh(hdr->version);
+			btsnoop_type = be32toh(hdr->type);
 
 			printf("btsnoop version: %d datalink type: %d\n",
 						btsnoop_version, btsnoop_type);
@@ -496,8 +496,8 @@ static int open_file(char *file, int mode, unsigned long flags)
 			btsnoop_type = 1002;
 
 			memcpy(hdr->id, btsnoop_id, sizeof(btsnoop_id));
-			hdr->version = htonl(btsnoop_version);
-			hdr->type = htonl(btsnoop_type);
+			hdr->version = htobe32(btsnoop_version);
+			hdr->type = htobe32(btsnoop_type);
 
 			printf("btsnoop version: %d datalink type: %d\n",
 						btsnoop_version, btsnoop_type);